Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Disallow empty section and variable names
[gitweb.git]
/
t
/
t3030-merge-recursive.sh
diff --git
a/t/t3030-merge-recursive.sh
b/t/t3030-merge-recursive.sh
index 3935c4b1c4eab29f794c3ac8ee3b30931e0d2889..34794f8a70e1c9b71384363e022d08da4ac8872e 100755
(executable)
--- a/
t/t3030-merge-recursive.sh
+++ b/
t/t3030-merge-recursive.sh
@@
-557,7
+557,7
@@
test_expect_success 'reset and bind merge' '
echo "100644 $o0 0 c"
echo "100644 $o1 0 d/e"
) >expected &&
- test_cmp expected actual
+ test_cmp expected actual
&&
git read-tree --prefix=z/ master &&
git ls-files -s >actual &&