Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
3316:0e370798eebf 3317:966632304dde
24 resolving manifests 24 resolving manifests
25 overwrite None branchmerge True partial False 25 overwrite None branchmerge True partial False
26 ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9 26 ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9
27 test.txt: versions differ -> m 27 test.txt: versions differ -> m
28 merging test.txt 28 merging test.txt
29 resolving test.txt
30 my test.txt@. other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 29 my test.txt@. other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9
31 merging test.txt failed! 30 merging test.txt failed!
32 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 31 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
33 There are unresolved merges, you can redo the full merge using: 32 There are unresolved merges, you can redo the full merge using:
34 hg update -C 3 33 hg update -C 3