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