Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
tests: use a lowercase "usage:" string
[gitweb.git]
/
t
/
t9400-git-cvsserver-server.sh
diff --git
a/t/t9400-git-cvsserver-server.sh
b/t/t9400-git-cvsserver-server.sh
index 6c693ffe995776bbfccc2cce8c310e6f958fad6e..9502f2438aeeb47c0881b80326a4152002fc23ad 100755
(executable)
--- a/
t/t9400-git-cvsserver-server.sh
+++ b/
t/t9400-git-cvsserver-server.sh
@@
-400,7
+400,7
@@
cat >expected.C <<EOF
Line 0
=======
LINE 0
->>>>>>> merge.3
+>>>>>>> merge.
1.
3
EOF
for i in 1 2 3 4 5 6 7 8