view en/examples/issue29 @ 647:5ffee9123bbf

Fix most remaining examples
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 29 Jan 2009 22:46:56 -0800
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