Mercurial > hgbook
comparison en/examples/results/branching.merge.out @ 662:44d1363234d2
Move example output files into examples/results
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon, 09 Mar 2009 21:37:47 -0700 |
| parents | en/examples/branching.merge.out@5fc4a45c069f |
| children | 0d5935744f87 |
comparison
equal
deleted
inserted
replaced
| 661:f916a8c80554 | 662:44d1363234d2 |
|---|---|
| 1 $ \textbf{cd ../main} | |
| 2 $ \textbf{hg pull ../stable} | |
| 3 pulling from ../stable | |
| 4 searching for changes | |
| 5 adding changesets | |
| 6 adding manifests | |
| 7 adding file changes | |
| 8 added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 9 (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 10 $ \textbf{hg merge} | |
| 11 merging myfile | |
| 12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 13 (branch merge, don't forget to commit) | |
| 14 $ \textbf{hg commit -m 'Bring in bugfix from stable branch'} | |
| 15 $ \textbf{cat myfile} | |
| 16 This is a fix to a boring feature. | |
| 17 This is exciting and new! |