# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2006-10-07 22:30:26
# Node ID 438b0638dbf5a9fa2c1a7b7972eb68186720d4d4
# Parent  f49c90b468975f3a49b0f5c1340eb04301f80eb3

Fix undetected change bug in rename tests

diff --git a/tests/test-rename-merge2 b/tests/test-rename-merge2
--- a/tests/test-rename-merge2
+++ b/tests/test-rename-merge2
@@ -5,7 +5,7 @@ cd t
 
 cat <<'EOF' > merge
 #!/bin/sh
-echo merge > $1
+echo merge $1 $2 $3 > $1
 EOF
 chmod +x merge
 
diff --git a/tests/test-rename-merge2.out b/tests/test-rename-merge2.out
--- a/tests/test-rename-merge2.out
+++ b/tests/test-rename-merge2.out
@@ -16,9 +16,9 @@ my rev@e300d1c794ec other rev@735846fee2
 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
 --------------
 
 --------------