Mercurial > hgbook
annotate en/examples/results/branch-repo.merge.out @ 663:0d5935744f87
Switch from LaTeX to XML for examples.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 09 Mar 2009 21:39:23 -0700 |
parents | 44d1363234d2 |
children | 4432ad34b8e5 |
rev | line source |
---|---|
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
1 <screen><prompt>$</prompt> <userinput>hg merge</userinput> |
199 | 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3 (branch merge, don't forget to commit) | |
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
4 <prompt>$</prompt> <userinput>hg commit -m 'Merge bugfix from 1.0.1 branch'</userinput> |
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
5 <prompt>$</prompt> <userinput>hg push</userinput> |
199 | 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 | |
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
12 </screen> |