249 

   250 echo '% strip again'

   251 cd ..

   252 hg init strip

   253 cd strip

   254 touch foo

   255 hg add foo

   256 hg ci -m 'add foo' -d '0 0'

   257 echo >> foo

   258 hg ci -m 'change foo 1' -d '0 0'

   259 hg up -C 0

   260 echo 1 >> foo

   261 hg ci -m 'change foo 2' -d '0 0'

   262 HGMERGE=true hg merge

   263 hg ci -m merge -d '0 0'

   264 hg log

   265 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/'

   266 hg log

   267