summaryrefslogtreecommitdiff
path: root/t/t5536-fetch-conflicts.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-04-11 13:09:54 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-11 13:09:54 +0900
commit5ff42d42da9c2c26737988d19b347c99489c8faa (patch)
tree3067785e87b3602d464a1a2cf948fb273f91e813 /t/t5536-fetch-conflicts.sh
parentMerge branch 'cc/perf-aggregate-sort' (diff)
parenttest_must_be_empty: simplify file existence check (diff)
downloadtgif-5ff42d42da9c2c26737988d19b347c99489c8faa.tar.xz
Merge branch 'jc/test-must-be-empty'
Test helper update. * jc/test-must-be-empty: test_must_be_empty: simplify file existence check
Diffstat (limited to 't/t5536-fetch-conflicts.sh')
0 files changed, 0 insertions, 0 deletions