hgbook
view en/examples/results/branch-repo.merge.out @ 563:44d1363234d2
Move example output files into examples/results
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Mar 09 21:37:47 2009 -0700 (2009-03-09) |
parents | en/examples/branch-repo.merge.out@58e3a6c76725 |
children | 0d5935744f87 |
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