Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'br/blame-ignore'
[gitweb.git]
/
t
/
t6027-merge-binary.sh
diff --git
a/t/t6027-merge-binary.sh
b/t/t6027-merge-binary.sh
index 07735410b9536ba7639134c7ca0cda4f486f8291..4e6c7cb77e7dc42c9f21b8ca84f8a64b1ed7d3af 100755
(executable)
--- a/
t/t6027-merge-binary.sh
+++ b/
t/t6027-merge-binary.sh
@@
-45,7
+45,7
@@
test_expect_success resolve '
false
else
git ls-files -s >current
- test_cmp
current expec
t
+ test_cmp
expect curren
t
fi
'
@@
-60,7
+60,7
@@
test_expect_success recursive '
false
else
git ls-files -s >current
- test_cmp
current expec
t
+ test_cmp
expect curren
t
fi
'