hgbook
annotate en/examples/branch-repo.merge.out @ 520:bbc5db74bd77
changed many "X(" for "X ("
I did this only when inside the main text
I did this only when inside the main text
| author | Javier Rojas <jerojasro@devnull.li> |
|---|---|
| date | Sun Jan 18 22:31:20 2009 -0500 (2009-01-18) |
| parents | |
| children |
| rev | line source |
|---|---|
| bos@199 | 1 $ \textbf{hg merge} |
| 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@199 | 4 $ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'} |
| bos@199 | 5 $ \textbf{hg push} |
| 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 |