diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-02-22 12:28:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-22 12:28:25 -0800 |
| commit | f11f76b2bbcd23fe403744c055456a0bdf0981e7 (patch) | |
| tree | bbcf114146443e2f5d5d79ec8ed5ce160e5aab8a /t | |
| parent | Merge branch 'es/blame-commit-info-fix' (diff) | |
| parent | merge-file: correctly open files when in a subdir (diff) | |
| download | tgif-f11f76b2bbcd23fe403744c055456a0bdf0981e7.tar.xz | |
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')
| -rwxr-xr-x | t/t6023-merge-file.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index 3758961765..190ee903cf 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 |