Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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 3580 41989e55fa37
parent 2830 49988d9f0758
child 3592 fffc8a733bf9
equal deleted inserted replaced
3579:0ed2732aa393 3580:41989e55fa37 
     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 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
 
     3 abort: outstanding uncommited changes, use 'hg update -C' to lose changes
 
       
     4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
mercurial-crew-with-dirclash