Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-rename-merge1.out @ 3727:0fb66912040a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: report destinations of moves in merge action messages
author Matt Mackall <mpm@selenic.com>
date Thu, 30 Nov 2006 17:36:33 -0600
parents f4dece0f7016
children 723e0ddb6ada
line wrap: on
line diff
--- a/tests/test-rename-merge1.out
+++ b/tests/test-rename-merge1.out
@@ -4,7 +4,7 @@ merge
 resolving manifests
  overwrite None partial False
  ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
- a: remote moved -> m
+ a: remote moved to b -> m
  b2: remote created -> g
 merging a and b
 my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c