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)
commitf735a50...fdf0e1734438f0c0e6d70c4a81eea09e
tree50aca02...4a8e441ef3d67b08f8d38a9226e8c851copy hash to clipboard (tree)
parent1f7b196...2181c4d23959193327941ee4e065748ccopy hash to clipboard (diff)
parentcce076e...7107217faa942dddc20e79ae7350bc1fcopy hash to clipboard (diff)
git-mergetool.sh
t/t7800-difftool.sh