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-conflict.out
changeset 4385 93a4e72b4f83
parent 4361 46280c004f22
equal deleted inserted replaced
4384:1386a9cffc88 4385:93a4e72b4f83 
     5 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 
     5 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 
     6 There are unresolved merges, you can redo the full merge using:
 
     6 There are unresolved merges, you can redo the full merge using:
 
     7   hg update -C 2
 
     7   hg update -C 2
 
     8   hg merge 1
 
     8   hg merge 1
 
     9 e7fe8eb3e180+0d24b7662d3e+ tip
 
     9 e7fe8eb3e180+0d24b7662d3e+ tip
 
       
    10 <<<<<<< my
 
    10 something else
 
    11 something else
 
    11 =======
 
    12 =======
 
    12 something
 
    13 something
 
       
    14 >>>>>>> other
 
    13 M a
 
    15 M a
mercurial-crew-with-dirclash