Mercurial > hg

diff tests/test-rename-merge1.out @ 5857:c704b03884ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add a bit more sanity to divergent copy checks
author Matt Mackall <mpm@selenic.com>
date Mon, 14 Jan 2008 16:28:32 -0600
parents 8a5d8fb59ed2
children 5af5f0f9d724
line wrap: on
line diff
--- a/tests/test-rename-merge1.out	Fri Jan 11 23:36:56 2008 +0100
+++ b/tests/test-rename-merge1.out	Mon Jan 14 16:28:32 2008 -0600
@@ -11,9 +11,9 @@
    b
    b2
   all copies found (* = to merge, ! = divergent):
-   c2 -> a2 
+   c2 -> a2 !
    b -> a *
-   b2 -> a2 
+   b2 -> a2 !
   checking for directory renames
  a2: divergent renames -> dr
  a: remote moved to b -> m