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)
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found