mergetool: respect autocrlf by using checkout-index
authorCharles Bailey <charles@hashpling.org>
Wed, 21 Jan 2009 22:57:48 +0000 (22:57 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Jan 2009 09:13:19 +0000 (01:13 -0800)
commit0ec7b6c...6dad51f690cd985d4a5357634123c4b7
treeb7a8134...292f44b0b4e98e849b283d98f2f67b16copy hash to clipboard (tree)
parentb80da42...a13107c239ed40573fae3d692d19b6cdcopy hash to clipboard (diff)
git-mergetool.sh
t/t7610-mergetool.sh