Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
fast-import: stricter parsing of integer options
[gitweb.git]
/
t
/
t3030-merge-recursive.sh
diff --git
a/t/t3030-merge-recursive.sh
b/t/t3030-merge-recursive.sh
index e66e550b2449e76435a0bf16c6a9889c0794f858..20d4f11dbe7edda104364ad282af94b13367224b 100755
(executable)
--- a/
t/t3030-merge-recursive.sh
+++ b/
t/t3030-merge-recursive.sh
@@
-544,7
+544,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 &&