Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
remote-curl.c: Fix a compiler warning
[gitweb.git]
/
t
/
t6042-merge-rename-corner-cases.sh
diff --git
a/t/t6042-merge-rename-corner-cases.sh
b/t/t6042-merge-rename-corner-cases.sh
index 32591f94135755847b406389aba5779e73cff5e0..466fa3804bc8a840d994e9d2e9092f599cc87eab 100755
(executable)
--- a/
t/t6042-merge-rename-corner-cases.sh
+++ b/
t/t6042-merge-rename-corner-cases.sh
@@
-104,7
+104,7
@@
test_expect_failure 'conflict caused if rename not detected' '
test 0 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&
- test
6 -eq $(wc -l < c)
&&
+ test
_line_count = 6 c
&&
test $(git rev-parse HEAD:a) = $(git rev-parse B:a) &&
test $(git rev-parse HEAD:b) = $(git rev-parse A:b)
'