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

[Ingo Lohmar]

On Sun, Apr 03 2016 16:12 (+0200), Andreas Schwab wrote:

> Ingo Lohmar <address@hidden> writes:
>
>> Single caveat: Do NOT start a merge when you have uncommited changes.
>
> git merge will not allow overwriting uncommited changes anyway.
>
> Andreas.

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.

At least that's what everybody and the man page tell me, I can't
remember whether I tested it myself at some point.