hgbook

diff en/examples/branching @ 356:0db175abfaf3

some friggin' merge or something like that.
author jerojasro@localhost
date Tue Oct 21 22:41:51 2008 -0500 (2008-10-21)
parents 5fc4a45c069f
children
line diff
     1.1 --- a/en/examples/branching	Fri Mar 30 23:05:28 2007 -0700
     1.2 +++ b/en/examples/branching	Tue Oct 21 22:41:51 2008 -0500
     1.3 @@ -39,6 +39,7 @@
     1.4  cd stable-fix
     1.5  echo 'This is a fix to a boring feature.' > myfile
     1.6  hg commit -m 'Fix a bug'
     1.7 +#$ ignore: /tmp/branching.*
     1.8  hg push
     1.9  
    1.10  #$ name: