Mercurial Mercurial > hg / 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-merge-force.out
changeset 6336 4b0c9c674707
parent 6256 69c75d063c7a
child 8545 3682a19bb637
equal deleted inserted replaced
6335:e29557d687c9 6336:4b0c9c674707 
       
     1 created new head
 
     1 % local deleted a file, remote removed
 
     2 % local deleted a file, remote removed
 
     2 abort: outstanding uncommitted changes
 
     3 abort: outstanding uncommitted changes
 
     3 resolving manifests
 
     4 resolving manifests
 
     4 removing a
 
     5 removing a
 
     5 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
     6 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Mercurial