view en/examples/issue29 @ 304:e87fe9497b27

add progress percentage to todo.txt
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Sat, 09 Feb 2008 00:23:15 +0900
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