Mercurial > hg > gitserve

changeset 3288:438b0638dbf5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix undetected change bug in rename tests
author Matt Mackall <mpm@selenic.com>
date Sat, 07 Oct 2006 17:30:26 -0500
parents f49c90b46897
children 48ae77d1e083
files tests/test-rename-merge2 tests/test-rename-merge2.out
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
 --------------
 
 --------------