On Tue, Aug 17, 2010 at 07:03, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > Before: > > You are in the middle of a conflicted merge. > > After: > > Merge is not possible because you have unmerged files. > > I prefer the old message. I prefer the new one, thanks :) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html