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