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 4361 46280c004f22
parent 2175 b2ae81a7df29
child 4385 93a4e72b4f83
equal deleted inserted replaced
4360:d5c3a70f8422 4361:46280c004f22 
     1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
     1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
     2 merge: warning: conflicts during merge
 
     2 warning: conflicts during merge.
 
     3 merging a
 
     3 merging a
 
     4 merging a failed!
 
     4 merging a failed!
 
     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
mercurial-crew-with-dirclash