]> git.ipfire.org Git - thirdparty/git.git/commit - git-mergetool.sh
difftool/mergetool: make the form of yes/no questions consistent
authorNikola Forró <nforro@redhat.com>
Tue, 12 Apr 2016 14:44:20 +0000 (16:44 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Apr 2016 22:15:17 +0000 (15:15 -0700)
commitcce076e37107217faa942dddc20e79ae7350bc1f
tree75c4cfa723fddad28349318907bf2ec8a39b8633
parente46579643d56162299b1756b70d418005351b256
difftool/mergetool: make the form of yes/no questions consistent

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.

Reviewed-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Nikola Forró <nforro@redhat.com>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-difftool--helper.sh
git-mergetool--lib.sh
git-mergetool.sh
t/t7800-difftool.sh