mergetool: use more conservative temporary filenames
authorDavid Aguilar <davvid@gmail.com>
Fri, 10 Oct 2014 08:19:47 +0000 (01:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Oct 2014 19:07:48 +0000 (12:07 -0700)
commiteab335c...6d6677ff50e9fe94352150641bc05507
tree5914a1e...7a6d984b1402ab3f0970f685c9d8ff90copy hash to clipboard (tree)
parent9e8f8de...46b52682b3fca67d8602c694c10013e1copy hash to clipboard (diff)
git-mergetool.sh