Mercurial > hgbook

diff ja/examples/branch-named @ 776:019040fbf5f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged to upstream: phase 1
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Tue, 21 Apr 2009 00:36:40 +0900
parents en/examples/branch-named@2936cb7eae7a en/examples/branch-named@b0db5adf11c1
children
line wrap: on
line diff
--- a/ja/examples/branch-named	Mon Apr 20 23:50:34 2009 +0900
+++ b/ja/examples/branch-named	Tue Apr 21 00:36:40 2009 +0900
@@ -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