Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Michael Albinus]

Eli Zaretskii <address@hidden> writes:

> Btw, when you say you've committed tramp.el after resolving the
> conflicts, what exactly did you do?  Did you commit only that file, or
> did you commit all the files that were ready to be committed?

I've touched only tramp.el (and likely, I did something like "git reset
lisp/net/tramp.el" first). The other files I've simply reverted in
Emacs' vc-dir buffer, via "C-x v u", IIRC.

Best regards, Michael.