summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2014-10-15 01:35:19 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-16 12:09:51 -0700
commit688684eba436c021eaddab1725093bb953cf260d (patch)
tree27535d6d2dfc27fe19175b7edda2a7d7a4b94c2c /git-mergetool.sh
parent8f0cb41da26c1e20cfbcfded030d6539464b132e (diff)
downloadgit-688684eba436c021eaddab1725093bb953cf260d.tar.gz
t7610-mergetool: add test cases for mergetool.writeToTempda/mergetool-temporary-directory
Add tests to ensure that filenames start with "./" when mergetool.writeToTemp is false and do not start with "./" when mergetool.writeToTemp is true. 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