--- a/tests/test-rename-merge2 Sat Oct 07 22:11:02 2006 +0200
+++ b/tests/test-rename-merge2 Sun Oct 08 10:55:11 2006 +0200
@@ -5,7 +5,7 @@
cat <<'EOF' > merge
#!/bin/sh
-echo merge > $1
+echo merge $1 $2 $3 > $1
EOF
chmod +x merge
--- a/tests/test-rename-merge2.out Sat Oct 07 22:11:02 2006 +0200
+++ b/tests/test-rename-merge2.out Sun Oct 08 10:55:11 2006 +0200
@@ -16,9 +16,9 @@
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
+M a
M b
a
-C a
--------------
--------------