summaryrefslogtreecommitdiff
path: root/t/t6024-recursive-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-19 13:45:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-19 13:45:01 -0700
commit6ae5d9863ba13b5d138851d8e622c9ed05313966 (patch)
treedbd24f2f5d334f6348a83b99f1039b2c8a44c5d8 /t/t6024-recursive-merge.sh
parentMerge branch 'mv/sequencer-pick-error-diag' (diff)
parentt6200: avoid path mangling issue on Windows (diff)
downloadtgif-6ae5d9863ba13b5d138851d8e622c9ed05313966.tar.xz
Merge branch 'rt/commentchar-fmt-merge-msg'
A test fix for recent update. * rt/commentchar-fmt-merge-msg: t6200: avoid path mangling issue on Windows
Diffstat (limited to 't/t6024-recursive-merge.sh')
0 files changed, 0 insertions, 0 deletions