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 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 THE merge".

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

Andrew Wong writes: > Signed-off-by: Andrew Wong > --- > wt-status.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/wt-status.c b/wt-status.c > index 4e55810..6e1ad7d 100644 > --- a/wt-status.c > +++ b/wt-status.c > @@ -899,7 +899,7 @@ static void show_merge_in_progres

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

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

Signed-off-by: Andrew Wong --- wt-status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wt-status.c b/wt-status.c index 4e55810..6e1ad7d 100644 --- a/wt-status.c +++ b/wt-status.c @@ -899,7 +899,7 @@ static void show_merge_in_progress(struct wt_status *s, st