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-merge5.out
changeset 6350 6aa4a3fa4e60
parent 6336 4b0c9c674707
child 6375 cdc458b12f0f
equal deleted inserted replaced
6349:6aaf5b1d8f15 6350:6aa4a3fa4e60 
     1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
     1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
     2 removing b
 
     2 removing b
 
     3 created new head
 
     3 created new head
 
       
     4 % should abort
 
     4 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
 
     5 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
 
       
     6 % should succeed
 
       
     7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
mercurial