comparison en/examples/results/branch-named.merge.out @ 663:0d5935744f87

Switch from LaTeX to XML for examples.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 21:39:23 -0700
parents 44d1363234d2
children 4432ad34b8e5
comparison
equal deleted inserted replaced
662:44d1363234d2 663:0d5935744f87
1 $ \textbf{hg branch} 1 <screen><prompt>$</prompt> <userinput>hg branch</userinput>
2 bar 2 bar
3 $ \textbf{hg merge foo} 3 <prompt>$</prompt> <userinput>hg merge foo</userinput>
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 (branch merge, don't forget to commit) 5 (branch merge, don't forget to commit)
6 $ \textbf{hg commit -m 'Merge'} 6 <prompt>$</prompt> <userinput>hg commit -m 'Merge'</userinput>
7 $ \textbf{hg tip} 7 <prompt>$</prompt> <userinput>hg tip</userinput>
8 changeset: 8 changeset:
9 branch: bar 9 branch: bar
10 tag: tip 10 tag: tip
11 parent: 11 parent:
12 parent: 12 parent:
13 user: Bryan O'Sullivan <bos@serpentine.com> 13 user: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
14 14
15 summary: Merge 15 summary: Merge
16 16
17 </screen>