Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-rename-merge2.out @ 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 764688cf51e5
line wrap: on
line diff
--- 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
 --------------
 
 --------------