hgbook
diff en/examples/branch-named @ 1017:77b4f62bed20
some typo and better french translation
author | André Sintzoff <andre.sintzoff@gmail.com> |
---|---|
date | Wed Nov 25 15:33:52 2009 +0100 (2009-11-25) |
parents | 6519f3b983b4 |
children |
line diff
1.1 --- a/en/examples/branch-named Mon Apr 23 15:28:13 2007 -0700 1.2 +++ b/en/examples/branch-named Wed Nov 25 15:33:52 2009 +0100 1.3 @@ -64,11 +64,10 @@ 1.4 #$ name: update-bar 1.5 1.6 hg update bar 1.7 -hg update -C bar 1.8 1.9 #$ name: merge 1.10 1.11 hg branch 1.12 -hg merge 1.13 +hg merge foo 1.14 hg commit -m 'Merge' 1.15 hg tip