Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-flags.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 b2ae81a7df29
children b7a46cbf3f59
line wrap: on
line diff
--- a/tests/test-flags.out
+++ b/tests/test-flags.out
@@ -44,7 +44,6 @@ summary:     added a b
 
 resolving manifests
 merging a
-resolving a
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 -rwxr-x---