hgbook
view en/examples/branching.stable.out @ 302:e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
Fix test itself as well (now requires 'hg resolve').
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed Aug 20 22:00:46 2008 +0200 (2008-08-20) |
| parents | 5fc4a45c069f |
| children | 7e52f0cc4516 |
line source
1 $ \textbf{hg clone stable stable-fix}
2 updating working directory
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 $ \textbf{cd stable-fix}
5 $ \textbf{echo 'This is a fix to a boring feature.' > myfile}
6 $ \textbf{hg commit -m 'Fix a bug'}
7 $ \textbf{hg push}
8 pushing to /tmp/branchingfJgZac/stable
9 searching for changes
10 adding changesets
11 adding manifests
12 adding file changes
13 added 1 changesets with 1 changes to 1 files