t7610-mergetool: prefer test_config over git config
authorDavid Aguilar <davvid@gmail.com>
Wed, 15 Oct 2014 08:35:20 +0000 (01:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2014 20:49:11 +0000 (13:49 -0700)
commitf9e4308...bb95034a36a223f4eba75174b096179c
tree5f8574c...e5f70ce6f430c2819bb48107d1c1ae22copy hash to clipboard (tree)
parent4756c05...41164a0889212f1e8151ff081b75bba2copy hash to clipboard (diff)
t/t7610-mergetool.sh