From: David Aguilar <davvid@gmail.com>
Date: Wed, 15 Oct 2014 08:35:20 +0000 (-0700)
Subject: t7610-mergetool: prefer test_config over git config
X-Git-Tag: v2.2.0-rc0~29^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f9e43085bb95034a36a223f4eba75174b096179c?hp=f9e43085bb95034a36a223f4eba75174b096179c

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>
---