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-merge-criss-cross.t
changeset 22673 16a46003b50c
parent 22672 19903277f035
child 23482 208ec8ca7c79
equal deleted inserted replaced
22672:19903277f035 22673:16a46003b50c 
   208 
   208 
   209 Verify how the output looks and and how verbose it is:
 
   209 Verify how the output looks and and how verbose it is:
 
   210 
   210 
   211   $ hg up -qC
 
   211   $ hg up -qC
 
   212   $ hg merge
 
   212   $ hg merge
 
   213   note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd
 
       
   214   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   213   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   215   (branch merge, don't forget to commit)
 
   214   (branch merge, don't forget to commit)
 
   216 
   215 
   217   $ hg up -qC
 
   216   $ hg up -qC
 
   218   $ hg merge -v
 
   217   $ hg merge -v
mercurial