Mercurial Mercurial > hg-stable / 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 6255 ae83d927c629
child 6256 69c75d063c7a
equal deleted inserted replaced
6254:3667b6e4bbd0 6255:ae83d927c629 
       
     1 % local deleted a file, remote removed
 
       
     2 resolving manifests
 
       
     3 removing a
 
       
     4 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
       
     5 (branch merge, don't forget to commit)
 
       
     6 % should show a as removed
 
       
     7 R a
 
       
     8 % manifest. should not have a:
 
       
     9 b
hg-stable