hgbook
annotate ja/examples/branch-repo.merge.out @ 966:39d37f84beaf
adding more new files - probably generated but still in versionning
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Sun Aug 16 13:20:24 2009 +0200 (2009-08-16) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{hg merge} |
| foozy@708 | 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| foozy@708 | 3 (branch merge, don't forget to commit) |
| foozy@708 | 4 $ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'} |
| foozy@708 | 5 $ \textbf{hg push} |
| foozy@708 | 6 pushing to |
| foozy@708 | 7 searching for changes |
| foozy@708 | 8 adding changesets |
| foozy@708 | 9 adding manifests |
| foozy@708 | 10 adding file changes |
| foozy@708 | 11 added 2 changesets with 1 changes to 1 files |