Re: Understanding a recent commit in emacs-25 branch [ed19f2]

[Andreas Schwab]

Ingo Lohmar <address@hidden> writes:

> That's correct, but if the changes are in files unaffected by the merge,
> git *does* start the merge.  But it will be hard to return to the exact
> pre-merge state if you want to abort.

git merge --abort will do.

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."