Mercurial > public > mercurial-scm > hg

diff tests/test-copy-move-merge.out @ 8753:af5f099d932b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: refactor manifestmerge init to better report effective ancestor
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 368a4ec603cc
children ba5e508b5e92
line wrap: on
line diff
--- a/tests/test-copy-move-merge.out	Mon Jun 08 18:14:44 2009 -0500
+++ b/tests/test-copy-move-merge.out	Mon Jun 08 18:14:44 2009 -0500
@@ -1,7 +1,4 @@
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
-resolving manifests
- overwrite None partial False
- ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0
   searching for copies back to rev 1
   unmatched files in other:
    b
@@ -10,6 +7,9 @@
    c -> a *
    b -> a *
   checking for directory renames
+resolving manifests
+ overwrite None partial False
+ ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0
  a: remote moved to c -> m
  a: remote moved to b -> m
 preserving a for resolve of b