1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/es/examples/issue29	Sat Aug 15 11:39:05 2009 +0200
     1.3 @@ -0,0 +1,22 @@
     1.4 +#!/bin/bash
     1.5 +
     1.6 +#$ name: go
     1.7 +
     1.8 +hg init issue29
     1.9 +cd issue29
    1.10 +echo a > a
    1.11 +hg ci -Ama
    1.12 +echo b > b
    1.13 +hg ci -Amb
    1.14 +hg up 0
    1.15 +mkdir b
    1.16 +echo b > b/b
    1.17 +hg ci -Amc
    1.18 +
    1.19 +#$ ignore: abort: Is a directory: .*
    1.20 +hg merge
    1.21 +
    1.22 +#$ name:
    1.23 +# This error is expected from the failed merge.
    1.24 +
    1.25 +exit 0