hgbook
annotate 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 |
| rev | line source |
|---|---|
| bos@611 | 1 <!-- BEGIN branch-named.merge --> |
| bos@564 | 2 <screen><prompt>$</prompt> <userinput>hg branch</userinput> |
| bos@206 | 3 bar |
| bos@564 | 4 <prompt>$</prompt> <userinput>hg merge foo</userinput> |
| bos@206 | 5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| bos@206 | 6 (branch merge, don't forget to commit) |
| bos@564 | 7 <prompt>$</prompt> <userinput>hg commit -m 'Merge'</userinput> |
| bos@564 | 8 <prompt>$</prompt> <userinput>hg tip</userinput> |
| bos@206 | 9 changeset: |
| bos@206 | 10 branch: bar |
| bos@206 | 11 tag: tip |
| bos@206 | 12 parent: |
| bos@206 | 13 parent: |
| bos@564 | 14 user: Bryan O'Sullivan <bos@serpentine.com> |
| bos@206 | 15 |
| bos@206 | 16 summary: Merge |
| bos@206 | 17 |
| bos@564 | 18 </screen> |
| bos@611 | 19 <!-- END branch-named.merge --> |