mergetool: Skip autoresolved paths
authorDavid Aguilar <davvid@gmail.com>
Tue, 17 Aug 2010 09:22:46 +0000 (02:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Aug 2010 20:58:13 +0000 (13:58 -0700)
commitbb0a484...985ef8d9bbbbeb172b1fcf4982634bef
tree771cfd9...6d36a707b99e47082b1bce376b49fa7bcopy hash to clipboard (tree)
parent3235b70...3c45a734c1cdf9b117bda68b7ced29c9copy hash to clipboard (diff)
git-mergetool.sh
t/t7610-mergetool.sh