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)
commitb974143...2746967c72e5b87cce39efea4b93e2bf
tree2737978...f20165cd0149efde1ed35cca7e2611e8copy hash to clipboard (tree)
parent9b782d2...7c141cc45973c8b455cc93495d86b277copy hash to clipboard (diff)
parentcce076e...7107217faa942dddc20e79ae7350bc1fcopy hash to clipboard (diff)
git-mergetool--lib.sh
git-mergetool.sh
t/t7800-difftool.sh