Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-rename-merge1.out @ 3317:966632304dde

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: shortcircuit filemerge for identical files - use filectx.cmp to compare files - move merge messages into filemerge - kill the redundant resolving message - update tests
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 01:16:06 -0500
parents ecc1bf27378c
children b16456909a0a
line wrap: on
line diff
--- a/tests/test-rename-merge1.out
+++ b/tests/test-rename-merge1.out
@@ -6,8 +6,7 @@ resolving manifests
  ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c
  a: remote moved -> m
  b2: remote created -> g
-merging a and b to b
-resolving a
+merging a and b
 my a@. other b@8e765a822af2 ancestor a@af1939970a1c
 copying a to b
 removing a