hgbook
diff en/examples/branch-named.merge.out @ 299:2936cb7eae7a
Fix sample output for test 'branch-named'.
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed Aug 20 21:55:35 2008 +0200 (2008-08-20) |
parents | 6519f3b983b4 |
children |
line diff
1.1 --- a/en/examples/branch-named.merge.out Mon Apr 23 15:28:13 2007 -0700 1.2 +++ b/en/examples/branch-named.merge.out Wed Aug 20 21:55:35 2008 +0200 1.3 @@ -1,6 +1,6 @@ 1.4 $ \textbf{hg branch} 1.5 bar 1.6 -$ \textbf{hg merge} 1.7 +$ \textbf{hg merge foo} 1.8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.9 (branch merge, don't forget to commit) 1.10 $ \textbf{hg commit -m 'Merge'}