view es/examples/issue29 @ 489:c3a867bba34a

modified definitions to allow optional arguments for the inclusion of images. This needs to be tested for html generation. translated up to section 2.2.1 ot tour-merge

#!/bin/bash

#$ name: go

hg init issue29
cd issue29
echo a > a
hg ci -Ama
echo b > b
hg ci -Amb
hg up 0
mkdir b
echo b > b/b
hg ci -Amc

#$ ignore: abort: Is a directory: .*
hg merge

#$ name:
# This error is expected from the failed merge.

exit 0