hgbook
diff 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 diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/branch-named.merge.out Wed Aug 20 21:51:54 2008 +0200 1.3 @@ -0,0 +1,16 @@ 1.4 +$ \textbf{hg branch} 1.5 +bar 1.6 +$ \textbf{hg merge} 1.7 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.8 +(branch merge, don't forget to commit) 1.9 +$ \textbf{hg commit -m 'Merge'} 1.10 +$ \textbf{hg tip} 1.11 +changeset: 1.12 +branch: bar 1.13 +tag: tip 1.14 +parent: 1.15 +parent: 1.16 +user: Bryan O'Sullivan <bos@serpentine.com> 1.17 + 1.18 +summary: Merge 1.19 +