hgbook
view en/examples/results/branch-named.merge.out @ 564:0d5935744f87
Switch from LaTeX to XML for examples.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Mar 09 21:39:23 2009 -0700 (2009-03-09) |
| parents | 44d1363234d2 |
| children | 4432ad34b8e5 |
line source
1 <screen><prompt>$</prompt> <userinput>hg branch</userinput>
2 bar
3 <prompt>$</prompt> <userinput>hg merge foo</userinput>
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 (branch merge, don't forget to commit)
6 <prompt>$</prompt> <userinput>hg commit -m 'Merge'</userinput>
7 <prompt>$</prompt> <userinput>hg tip</userinput>
8 changeset:
9 branch: bar
10 tag: tip
11 parent:
12 parent:
13 user: Bryan O'Sullivan <bos@serpentine.com>
15 summary: Merge
17 </screen>