Mercurial Mercurial > hg > mercurial-crew-with-dirclash / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge7.out
changeset 3122 2ef0b3aae186
parent 3111 40e777bda455
child 3233 3fd098e0902d
equal deleted inserted replaced
3121:1c1e59aac82a 3122:2ef0b3aae186 
    22 (run 'hg heads' to see heads, 'hg merge' to merge)
 
    22 (run 'hg heads' to see heads, 'hg merge' to merge)
 
    23 merge: warning: conflicts during merge
 
    23 merge: warning: conflicts during merge
 
    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, resolve
 
    27  test.txt: versions differ -> m
 
    28 merging test.txt
 
    28 merging test.txt
 
    29 resolving test.txt
 
    29 resolving test.txt
 
    30 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557
 
    30 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557
 
    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
mercurial-crew-with-dirclash