summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-22 20:28:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-02-22 20:28:25 (GMT)
commitf11f76b2bbcd23fe403744c055456a0bdf0981e7 (patch)
treebbcf114146443e2f5d5d79ec8ed5ce160e5aab8a /t/t6023-merge-file.sh
parent073bb8ebb8f6213080162ac5632ba853d2e8cceb (diff)
parent204a8ffe67d2b789a34a14a06618a24756f7d9a9 (diff)
downloadgit-f11f76b2bbcd23fe403744c055456a0bdf0981e7.zip
git-f11f76b2bbcd23fe403744c055456a0bdf0981e7.tar.gz
git-f11f76b2bbcd23fe403744c055456a0bdf0981e7.tar.bz2
Merge branch 'ab/merge-file-prefix'
"git merge-file" did not work correctly in a subdirectory. * ab/merge-file-prefix: merge-file: correctly open files when in a subdir
Diffstat (limited to 't/t6023-merge-file.sh')
-rwxr-xr-xt/t6023-merge-file.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 3758961..190ee90 100755
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -69,7 +69,8 @@ test_expect_success 'works in subdirectory' '
cp new1.txt dir/a.txt &&
cp orig.txt dir/o.txt &&
cp new2.txt dir/b.txt &&
- ( cd dir && git merge-file a.txt o.txt b.txt )
+ ( cd dir && git merge-file a.txt o.txt b.txt ) &&
+ test_path_is_missing a.txt
'
cp new1.txt test.txt