summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2021-09-13 15:19:12 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-13 12:47:06 -0700
commitf20c1fb296be2a18426541573146159fdbcc668c (patch)
tree3111555422f5bc2b501cf041c531e44163181526 /merge-recursive.c
parentThe fifth batch (diff)
downloadtgif-f20c1fb296be2a18426541573146159fdbcc668c.tar.xz
t3407: run tests in $TEST_DIRECTORY
Commit 97b88dd58c ("git-rebase.sh: Fix --merge --abort failures when path contains whitespace", 2008-05-04) started running these tests in a subdirectory with a space in its name. At that time $TEST_DIRECTORY did not contain a space but shortly after in 4a7aaccd83 ("Rename the test trash directory to contain spaces.", 2008-05-04) $TEST_DIRECTORY was changed to contain a space so we no longer need to run these tests in a subdirectory. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions