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-merge-force.out
changeset 8545 3682a19bb637
parent 6336 4b0c9c674707
equal deleted inserted replaced
8544:48dd8a93d6db 8545:3682a19bb637 
     1 created new head
 
     1 created new head
 
     2 % local deleted a file, remote removed
 
     2 % local deleted a file, remote removed
 
     3 abort: outstanding uncommitted changes
 
     3 abort: outstanding uncommitted changes (use 'hg status' to list changes)
 
     4 resolving manifests
 
     4 resolving manifests
 
     5 removing a
 
     5 removing a
 
     6 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
 
     7 (branch merge, don't forget to commit)
 
     7 (branch merge, don't forget to commit)
 
     8 % should show a as removed
 
     8 % should show a as removed
mercurial