Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge7.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 e7abcf3a7c5f
children b16456909a0a
line wrap: on
line diff
--- a/tests/test-merge7.out
+++ b/tests/test-merge7.out
@@ -26,7 +26,6 @@ resolving manifests
  ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9
  test.txt: versions differ -> m
 merging test.txt
-resolving test.txt
 my test.txt@. other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9
 merging test.txt failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved