Re: [PATCH] difftool/mergetool: make the form of yes/no questions consistent

2016-04-12 Thread David Aguilar
On Tue, Apr 12, 2016 at 03:01:19PM +0100, John Keeping wrote: > On Tue, Apr 12, 2016 at 03:53:12PM +0200, Nikola Fo wrote: > > On Tue, 2016-04-12 at 14:27 +0100, John Keeping wrote: > > > I think the case in these two is correct as-is. The "Y" is capitalised > > > because it is the default and

Re: [PATCH] difftool/mergetool: make the form of yes/no questions consistent

2016-04-12 Thread Junio C Hamano
Nikola Forró writes: > Every yes/no question in difftool/mergetool scripts has slightly > different form, and none of them is consistent with the form git > itself uses. > > Make the form of all the questions consistent with the form used > by git, i.e. "Question [y/n]? ". > > Signed-off-by: Niko

Re: [PATCH] difftool/mergetool: make the form of yes/no questions consistent

2016-04-12 Thread John Keeping
On Tue, Apr 12, 2016 at 03:53:12PM +0200, Nikola Fo wrote: > On Tue, 2016-04-12 at 14:27 +0100, John Keeping wrote: > > I think the case in these two is correct as-is. The "Y" is capitalised > > because it is the default and will take effect if the user just presses > > ENTER. > > Thanks John

Re: [PATCH] difftool/mergetool: make the form of yes/no questions consistent

2016-04-12 Thread Nikola Forró
On Tue, 2016-04-12 at 14:27 +0100, John Keeping wrote: > I think the case in these two is correct as-is. The "Y" is capitalised > because it is the default and will take effect if the user just presses > ENTER. Thanks John, I'm aware of that. That's why the patch doesn't change the case. Maybe I

Re: [PATCH] difftool/mergetool: make the form of yes/no questions consistent

2016-04-12 Thread John Keeping
On Tue, Apr 12, 2016 at 02:59:42PM +0200, Nikola Fo wrote: > Every yes/no question in difftool/mergetool scripts has slightly > different form, and none of them is consistent with the form git > itself uses. > > Make the form of all the questions consistent with the form used > by git, i.e. "Q