annotate en/examples/results/branch-repo.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 merge</userinput>
|
|
bos@199
|
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@199
|
3 (branch merge, don't forget to commit)
|
|
bos@564
|
4 <prompt>$</prompt> <userinput>hg commit -m 'Merge bugfix from 1.0.1 branch'</userinput>
|
|
bos@564
|
5 <prompt>$</prompt> <userinput>hg push</userinput>
|
|
bos@199
|
6 pushing to
|
|
bos@199
|
7 searching for changes
|
|
bos@199
|
8 adding changesets
|
|
bos@199
|
9 adding manifests
|
|
bos@199
|
10 adding file changes
|
|
bos@199
|
11 added 2 changesets with 1 changes to 1 files
|
|
bos@564
|
12 </screen>
|
