]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitf735a50ffdf0e1734438f0c0e6d70c4a81eea09e
tree50aca0214a8e441ef3d67b08f8d38a9226e8c851tree | snapshot
parent1f7b196e2181c4d23959193327941ee4e065748ccommit | diff
parentcce076e37107217faa942dddc20e79ae7350bc1fcommit | diff
Merge branch 'nf/mergetool-prompt' into HEAD

UI consistency improvements.

* nf/mergetool-prompt:
  difftool/mergetool: make the form of yes/no questions consistent
git-mergetool.sh diff1 | diff2 | blob | history
t/t7800-difftool.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.