]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f7b196 cce076e)
Merge branch 'nf/mergetool-prompt' into HEAD
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 21:40:07 +0000 (14:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 21:40:07 +0000 (14:40 -0700)
UI consistency improvements.

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

1  2 
git-mergetool.sh patch | diff1 | diff2 | blob | history
t/t7800-difftool.sh patch | diff1 | diff2 | blob | history

diff --cc git-mergetool.sh
Simple merge
diff --cc t/t7800-difftool.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.