hgbook
view 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 |
line source
1 $ \textbf{hg merge}
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3 (branch merge, don't forget to commit)
4 $ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'}
5 $ \textbf{hg push}
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