Mercurial > hgbook

annotate en/examples/results/tour.merge.commit.out @ 744:1114da00d30e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix '<programlisting>' in ch02-tour-basic.xml
author Dongsheng Song <dongsheng.song@gmail.com>
date Wed, 18 Mar 2009 19:43:46 +0800
parents 0d5935744f87
children 4432ad34b8e5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
1 <screen><prompt>$</prompt> <userinput>hg commit -m 'Merged changes'</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
2 </screen>