Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
builtin-clone: fix initial checkout
[gitweb.git]
/
t
/
t6029-merge-subtree.sh
diff --git
a/t/t6029-merge-subtree.sh
b/t/t6029-merge-subtree.sh
index 35d66e804416af7f773d9eebcacb310f0e788884..43f5459c35dd862b2b15b9883a4f2354a20e8e25 100755
(executable)
--- a/
t/t6029-merge-subtree.sh
+++ b/
t/t6029-merge-subtree.sh
@@
-25,7
+25,7
@@
test_expect_success 'subtree available and works like recursive' '
git merge -s subtree side &&
for i in mundo $s world; do echo $i; done >expect &&
-
diff -u
expect hello
+
test_cmp
expect hello
'