summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2011-10-14 23:53:28 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-14 22:37:29 -0700
commit9931df3fa97c274449c73a224994aa27f6790ae6 (patch)
tree9c1ba476952d5c5d444c285a5ac1b6f705151a3f /t/t7605-merge-resolve.sh
parentsend-email: Fix %config_path_settings handling (diff)
downloadtgif-9931df3fa97c274449c73a224994aa27f6790ae6.tar.xz
t1020: disable the pwd test on MinGW
It fails both for line ending and for DOS path reasons. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions