summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2014-10-15 08:35:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-15 20:49:11 (GMT)
commitf9e43085bb95034a36a223f4eba75174b096179c (patch)
tree5f8574cfe5f70ce6f430c2819bb48107d1c1ae22 /git-mergetool.sh
parent4756c05741164a0889212f1e8151ff081b75bba2 (diff)
downloadgit-f9e43085bb95034a36a223f4eba75174b096179c.zip
git-f9e43085bb95034a36a223f4eba75174b096179c.tar.gz
git-f9e43085bb95034a36a223f4eba75174b096179c.tar.bz2
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>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions