| commit | f9e43085bb95034a36a223f4eba75174b096179c | |
| author | David Aguilar <davvid@gmail.com> | |
| Wed, 15 Oct 2014 08:35:20 +0000 (15 01:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Oct 2014 20:49:11 +0000 (15 13:49 -0700) | ||
| tree | 5f8574cfe5f70ce6f430c2819bb48107d1c1ae22 | treesnapshot (tar.gz zip) |
| parent | 4756c05741164a0889212f1e8151ff081b75bba2 | commitdiff |
t7610-mergetool: prefer test_config over git config
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7610-mergetool.sh | diffblobblamehistory |