Thread (36 messages) flat view 36 messages, 4 authors, 2016-06-15

Re: [PATCH 13/24] merge script: tweak unmerged files message to match builtin

From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2016-06-15 22:49:20

On Tue, Aug 17, 2010 at 07:03, Jonathan Nieder [off-list ref] 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 :)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help