Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-rename-merge1.out @ 3280:ae85272b59a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: copy fixes and tests Fix up "already seen" logic Fix merge action in remote copy case Add status message Add lots of merge+copy/move test cases
author Matt Mackall <mpm@selenic.com>
date Fri, 06 Oct 2006 16:55:11 -0500
parents c93ce7f10f85
children 764688cf51e5
line wrap: on
line diff
--- a/tests/test-rename-merge1.out
+++ b/tests/test-rename-merge1.out
@@ -6,6 +6,7 @@ resolving manifests
  ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c
  a: remote moved -> c
  b2: remote created -> g
+merging a and b to b
 resolving a
 my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c
 copying a to b