Mercurial > hgbook

view en/examples/results/backout.manual.merge.out @ 670:3bcc001ce34f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of lots of TeX-era cruft.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 23:37:19 -0700
parents 0d5935744f87
children 4432ad34b8e5
line wrap: on
line source

<screen><prompt>$</prompt> <userinput>hg merge</userinput>
merging myfile
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
<prompt>$</prompt> <userinput>hg commit -m 'merged backout with previous tip'</userinput>
<prompt>$</prompt> <userinput>cat myfile</userinput>
first change
third change
</screen>