Andrew's git / gitweb.git / diff
?
Merge branch 'nf/mergetool-prompt'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 May 2016 21:08:17 +0000 (14:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 May 2016 21:08:17 +0000 (14:08 -0700)
UI consistency improvements.

* nf/mergetool-prompt:
difftool/mergetool: make the form of yes/no questions consistent

1  2 
git-mergetool--lib.sh patch | diff1 | diff2 | blob | history
git-mergetool.sh patch | diff1 | diff2 | blob | history
t/t7800-difftool.sh patch | diff1 | diff2 | blob | history
diff --cc git-mergetool--lib.sh
Simple merge
diff --cc git-mergetool.sh
Simple merge
diff --cc t/t7800-difftool.sh
Simple merge