Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
3316:0e370798eebf 3317:966632304dde
42 date: Mon Jan 12 13:46:40 1970 +0000 42 date: Mon Jan 12 13:46:40 1970 +0000
43 summary: added a b 43 summary: added a b
44 44
45 resolving manifests 45 resolving manifests
46 merging a 46 merging a
47 resolving a
48 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 47 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
49 (branch merge, don't forget to commit) 48 (branch merge, don't forget to commit)
50 -rwxr-x--- 49 -rwxr-x---
51 -rwxr-x--- 50 -rwxr-x---