| commit | b97414352746967c72e5b87cce39efea4b93e2bf | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 May 2016 21:08:17 +0000 (3 14:08 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 May 2016 21:08:17 +0000 (3 14:08 -0700) | ||
| tree | 2737978df20165cd0149efde1ed35cca7e2611e8 | treesnapshot (tar.gz zip) |
| parent | 9b782d297c141cc45973c8b455cc93495d86b277 | commitdiff |
| parent | cce076e37107217faa942dddc20e79ae7350bc1f | commitdiff |
Merge branch 'nf/mergetool-prompt'
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--lib.sh | diff1 | diff2 | blobhistory |
| git-mergetool.sh | diff1 | diff2 | blobhistory |
| t/t7800-difftool.sh | diff1 | diff2 | blobhistory |