Mercurial > hgbook

diff en/examples/branch-named @ 398:2936cb7eae7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix sample output for test 'branch-named'.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed, 20 Aug 2008 21:55:35 +0200
parents 6519f3b983b4
children
line wrap: on
line diff
--- a/en/examples/branch-named	Wed Aug 20 21:54:18 2008 +0200
+++ b/en/examples/branch-named	Wed Aug 20 21:55:35 2008 +0200
@@ -64,11 +64,10 @@
 #$ name: update-bar
 
 hg update bar
-hg update -C bar
 
 #$ name: merge
 
 hg branch
-hg merge
+hg merge foo
 hg commit -m 'Merge'
 hg tip