hgbook
annotate ja/examples/tour.merge.pull.out @ 980:c40dac4f63d8
merge with Jean Marie Clément
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Fri Sep 04 18:55:53 2009 +0200 (2009-09-04) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{hg pull ../my-hello} |
| foozy@708 | 2 pulling from ../my-hello |
| foozy@708 | 3 searching for changes |
| foozy@708 | 4 adding changesets |
| foozy@708 | 5 adding manifests |
| foozy@708 | 6 adding file changes |
| foozy@708 | 7 added 1 changesets with 1 changes to 1 files (+1 heads) |
| foozy@708 | 8 (run 'hg heads' to see heads, 'hg merge' to merge) |