Re: [RFC 1/3] wt-status: Make conflict hint message more consistent with other hints

Hi, Andrew Wong wrote: [Subject: wt-status: Make conflict hint message more consistent with other hints] Thanks for working on this. Could you include a little more detail? What other hints is this making the message more consistent with? Ideally the commit message would include a quick

Re: [RFC 1/3] wt-status: Make conflict hint message more consistent with other hints

On Wed, Feb 26, 2014 at 3:37 PM, Junio C Hamano gits...@pobox.com wrote: I see that you are trying to match the phrasing used in the other side of this if/else (which is outside the context of the posted patch). Over there we say ... to conclude merge while the new text says ... to conclude