Mercurial > hg
diff tests/test-rename-merge2.out @ 8748:f325574dad1a
merge: combine a copy and move case
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 08 Jun 2009 18:14:44 -0500 |
| parents | 5bf5fd1e2a74 |
| children | af5f099d932b |
line wrap: on
line diff
--- a/tests/test-rename-merge2.out Mon Jun 08 18:14:44 2009 -0500 +++ b/tests/test-rename-merge2.out Mon Jun 08 18:14:44 2009 -0500 @@ -44,7 +44,7 @@ b -> a * checking for directory renames a: remote is newer -> g - b: local copied to a -> m + b: local copied/moved to a -> m rev: versions differ -> m preserving b for resolve of b preserving rev for resolve of rev @@ -109,7 +109,7 @@ all copies found (* = to merge, ! = divergent): b -> a * checking for directory renames - b: local moved to a -> m + b: local copied/moved to a -> m rev: versions differ -> m preserving b for resolve of b preserving rev for resolve of rev @@ -546,7 +546,7 @@ all copies found (* = to merge, ! = divergent): b -> a * checking for directory renames - b: local moved to a -> m + b: local copied/moved to a -> m rev: versions differ -> m preserving b for resolve of b preserving rev for resolve of rev @@ -578,7 +578,7 @@ all copies found (* = to merge, ! = divergent): b -> a * checking for directory renames - b: local moved to a -> m + b: local copied/moved to a -> m rev: versions differ -> m c: remote created -> g preserving b for resolve of b