Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-rename-merge2.out @ 5046:bf444a9a9c23
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Aug 2007 14:03:48 -0500 |
parents | f191bc3916f7 |
children | 4b6f0aa568e5 |
line wrap: on
line diff
--- a/tests/test-rename-merge2.out +++ b/tests/test-rename-merge2.out @@ -6,17 +6,17 @@ resolving manifests ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7 rev: versions differ -> m a: remote copied to b -> m +copying a to b merging a and b my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 -copying a to b merging rev my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 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 -------------- -------------- @@ -49,9 +49,9 @@ resolving manifests ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b rev: versions differ -> m a: remote moved to b -> m +copying a to b merging a and b my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 -copying a to b removing a merging rev my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 @@ -357,9 +357,9 @@ resolving manifests ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 rev: versions differ -> m a: remote moved to b -> m +copying a to b merging a and b my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 -copying a to b removing a merging rev my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337