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-merge5.out
branchstable
changeset 12795 3cb0559e44d0
parent 12793 469850088fc1
parent 12794 6bf8d48bec8e
child 12796 bc69ba99e34b
equal deleted inserted replaced
12793:469850088fc1 12795:3cb0559e44d0 
     1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
       
     2 removing b
 
       
     3 created new head
 
       
     4 % should abort
 
       
     5 abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
 
       
     6 % should succeed
 
       
     7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Mercurial