Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
http: limit redirection depth
[gitweb.git]
/
t
/
t6023-merge-file.sh
diff --git
a/t/t6023-merge-file.sh
b/t/t6023-merge-file.sh
index 3758961765635c4ce504eec1540605f65efd386a..190ee903cf6269071809e82d61d6065f1de679c6 100755
(executable)
--- 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