On Tue, Jan 29, 2019 at 4:58 AM Junio C Hamano <gits...@pobox.com> wrote: > One small bug I saw since this was merged is that the message that > is given when unmerging, i.e. > > git merge other-branch ;# conflicts > git checkout --m <path> > > is misleading. It gives the same "checked out ... out of the index", > but it should be made a lot more distinct, perhaps "unmerged N paths".
Right, I missed this. How about "re-created %d merge conflicts"? It's a bit clearer, I think. -- Duy
