hgbook
annotate en/examples/branch-named.merge.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 | 6519f3b983b4 |
| children |
| rev | line source |
|---|---|
| bos@206 | 1 $ \textbf{hg branch} |
| bos@206 | 2 bar |
| hg@299 | 3 $ \textbf{hg merge foo} |
| bos@206 | 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| bos@206 | 5 (branch merge, don't forget to commit) |
| bos@206 | 6 $ \textbf{hg commit -m 'Merge'} |
| bos@206 | 7 $ \textbf{hg tip} |
| bos@206 | 8 changeset: |
| bos@206 | 9 branch: bar |
| bos@206 | 10 tag: tip |
| bos@206 | 11 parent: |
| bos@206 | 12 parent: |
| bos@206 | 13 user: Bryan O'Sullivan <bos@serpentine.com> |
| bos@206 | 14 |
| bos@206 | 15 summary: Merge |
| bos@206 | 16 |