Mercurial Mercurial > mercurial / 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 3727 0fb66912040a
parent 3674 9103dab96093
child 3730 d377f8d25662 
--- a/tests/test-rename-merge2.out	Thu Nov 30 13:51:58 2006 -0800
+++ b/tests/test-rename-merge2.out	Thu Nov 30 17:36:33 2006 -0600
@@ -5,7 +5,7 @@
  overwrite None partial False
  ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7
  rev: versions differ -> m
- a: remote copied -> m
+ a: remote copied to b -> m
 merging a and b
 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337
 copying a to b
@@ -26,7 +26,7 @@
  overwrite None partial False
  ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71
  a: remote is newer -> g
- b: local copied -> m
+ b: local copied to a -> m
  rev: versions differ -> m
 getting a
 merging b and a
@@ -47,7 +47,7 @@
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b
- a: remote moved -> m
+ a: remote moved to b -> m
  rev: versions differ -> m
 merging a and b
 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337
@@ -68,7 +68,7 @@
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71
- b: local moved -> m
+ b: local moved to a -> m
  rev: versions differ -> m
 merging b and a
 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337
@@ -351,7 +351,7 @@
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7
- a: remote moved -> m
+ a: remote moved to b -> m
  rev: versions differ -> m
 merging a and b
 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337
@@ -372,7 +372,7 @@
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71
- b: local moved -> m
+ b: local moved to a -> m
  rev: versions differ -> m
 merging b and a
 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337
@@ -391,7 +391,7 @@
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f
- b: local moved -> m
+ b: local moved to a -> m
  rev: versions differ -> m
  c: remote created -> g
 merging b and a
mercurial