view en/examples/issue29 @ 251:2e73abddad21

Avoid converting UTF8-encoded angle brackets into ASCII (per Johannes Hoff). Finally write up what fixhtml.py is actually doing.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 30 May 2007 21:50:21 -0700
parents 91a936be78b8
children
line wrap: on
line source

#!/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