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

[Eli Zaretskii]

> From: Ingo Lohmar <address@hidden>
> Date: Sun, 03 Apr 2016 16:57:54 +0200
> Cc: Alan Mackenzie <address@hidden>, Kaushal Modi <address@hidden>,
>       Emacs developers <address@hidden>
> 
> > 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.

Git stops the merge at the point where it's quite easy to abort or
stash the uncommitted changes.  When Git stops, it displays a message
with these 2 alternatives; following either alternative is easy and
safe.