--- a/tests/test-rename-merge2 Fri Oct 06 17:14:50 2006 -0500
+++ b/tests/test-rename-merge2 Sat Oct 07 17:30:26 2006 -0500
@@ -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 Fri Oct 06 17:14:50 2006 -0500
+++ b/tests/test-rename-merge2.out Sat Oct 07 17:30:26 2006 -0500
@@ -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
--------------
--------------