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 2175 b2ae81a7df29
parent 2038 5c4496ed152d
child 2830 49988d9f0758
equal deleted inserted replaced
2174:3044a3fdae76 2175:b2ae81a7df29 
       
     1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
     1 removing b
 
     2 removing b
 
     2 this update spans a branch affecting the following files:
 
     3 this update spans a branch affecting the following files:
 
     3  b
 
     4  b
 
     4 aborting update spanning branches!
 
     5 aborting update spanning branches!
 
     5 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)
 
     6 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)
mercurial