hgbook
view en/examples/branch-named.merge.out @ 296:e0b56f008b09
Fix sample output for 'backout' test.
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed Aug 20 21:51:54 2008 +0200 (2008-08-20) |
| parents | |
| children | 2936cb7eae7a |
line source
1 $ \textbf{hg branch}
2 bar
3 $ \textbf{hg merge}
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 (branch merge, don't forget to commit)
6 $ \textbf{hg commit -m 'Merge'}
7 $ \textbf{hg tip}
8 changeset:
9 branch: bar
10 tag: tip
11 parent:
12 parent:
13 user: Bryan O'Sullivan <bos@serpentine.com>
15 summary: Merge