hgbook
view en/examples/results/branch-named.merge.out @ 611:4432ad34b8e5
Check in example outputs with begin/end markers.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Mar 31 12:19:01 2009 -0700 (2009-03-31) |
| parents | 0d5935744f87 |
| children |
line source
1 <!-- BEGIN branch-named.merge -->
2 <screen><prompt>$</prompt> <userinput>hg branch</userinput>
3 bar
4 <prompt>$</prompt> <userinput>hg merge foo</userinput>
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6 (branch merge, don't forget to commit)
7 <prompt>$</prompt> <userinput>hg commit -m 'Merge'</userinput>
8 <prompt>$</prompt> <userinput>hg tip</userinput>
9 changeset:
10 branch: bar
11 tag: tip
12 parent:
13 parent:
14 user: Bryan O'Sullivan <bos@serpentine.com>
16 summary: Merge
18 </screen>
19 <!-- END branch-named.merge -->