Mercurial Mercurial > hg > mercurial-crew-with-dirclash / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rename-merge2.out
changeset 3730 d377f8d25662
parent 3727 0fb66912040a
child 4311 4787e2b0dd03 
--- a/tests/test-rename-merge2.out
+++ b/tests/test-rename-merge2.out
@@ -47,8 +47,8 @@ test L:up a   R:nm a b W:       - 3  get
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b
+ rev: versions differ -> m
  a: remote moved to b -> m
- rev: versions differ -> m
 merging a and b
 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337
 copying a to b
@@ -351,8 +351,8 @@ test L:up a   R:um a b W:       - 20 mer
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7
+ rev: versions differ -> m
  a: remote moved to b -> m
- rev: versions differ -> m
 merging a and b
 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337
 copying a to b
mercurial-crew-with-dirclash