| commit | f735a50ffdf0e1734438f0c0e6d70c4a81eea09e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 May 2016 21:40:07 +0000 (18 14:40 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 May 2016 21:40:07 +0000 (18 14:40 -0700) | ||
| tree | 50aca0214a8e441ef3d67b08f8d38a9226e8c851 | treesnapshot (tar.gz zip) |
| parent | 1f7b196e2181c4d23959193327941ee4e065748c | commitdiff |
| parent | cce076e37107217faa942dddc20e79ae7350bc1f | commitdiff |
Merge branch 'nf/mergetool-prompt' into HEAD
UI consistency improvements.
* nf/mergetool-prompt:
difftool/mergetool: make the form of yes/no questions consistent
UI consistency improvements.
* nf/mergetool-prompt:
difftool/mergetool: make the form of yes/no questions consistent
| git-mergetool.sh | diff1 | diff2 | blobhistory |
| t/t7800-difftool.sh | diff1 | diff2 | blobhistory |