hgbook

diff en/examples/branch-named @ 948:afdc168fa06c

find changesets by author, revision, files, or words in the commit message
Merge from Hugues and my work
author Romain PELISSE <belaran@gmail.com>
date Mon Feb 16 23:31:14 2009 +0100 (2009-02-16)
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	Mon Feb 16 23:31:14 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