Merge branch 'da/mergetool-temporary-filename'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2014 20:28:19 +0000 (13:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2014 20:28:20 +0000 (13:28 -0700)
commit02f4db8...bd979fe33f18006fa612d7d5ab1d2470
treeb46eec9...6a6c9045c6a5819460d495f5519af6f4copy hash to clipboard (tree)
parent64bff25...78da5ae2e64f0598df20370c45aad7efcopy hash to clipboard (diff)
parenteab335c...6d6677ff50e9fe94352150641bc05507copy hash to clipboard (diff)
git-mergetool.sh