Merge branch 'da/mergetool-temporary-directory'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2014 20:28:42 +0000 (13:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2014 20:28:42 +0000 (13:28 -0700)
commita46af59...6c3ec125e0c2fee889610485eb4a6e14
tree3ed4083...fea576ca667c5704412122780437e2c4copy hash to clipboard (tree)
parente96e98b...399ae4c638466f84068fe94d4712c5a3copy hash to clipboard (diff)
parent688684e...a436c021eaddab1725093bb953cf260dcopy hash to clipboard (diff)
Documentation/config.txt
git-mergetool.sh
t/t7610-mergetool.sh