Mercurial Mercurial > mercurial / 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-update-renames.t
changeset 16911 39d38f16a3f7
parent 15501 2371f4aea665
child 26614 ef1eb6df7071
equal deleted inserted replaced
16910:ad229181ddbe 16911:39d38f16a3f7 
    23   warning: conflicts during merge.
 
    23   warning: conflicts during merge.
 
    24   merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
 
    24   merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
 
    25   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 
    25   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 
    26   use 'hg resolve' to retry unresolved file merges
 
    26   use 'hg resolve' to retry unresolved file merges
 
    27   [1]
 
    27   [1]
 
    28 
       
    29   $ cd ..
 
       
    30
mercurial