Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge7.out @ 3305:e7abcf3a7c5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: use contexts rather than my and other
author Matt Mackall <mpm@selenic.com>
date Mon, 09 Oct 2006 21:27:04 -0500
parents 3fd098e0902d
children 966632304dde
comparison
equal deleted inserted replaced
3304:45f0c49f0449 3305:e7abcf3a7c5f
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 29 resolving test.txt
30 my test.txt@451c744aabcc other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 30 my test.txt@. other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9
31 merging test.txt failed! 31 merging test.txt failed!
32 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 32 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
33 There are unresolved merges, you can redo the full merge using: 33 There are unresolved merges, you can redo the full merge using:
34 hg update -C 3 34 hg update -C 3
35 hg merge 4 35 hg merge 4