view es/examples/issue29 @ 449:74224b4f6928

this file was a symlink; this was intended to keep track of the file on any change that might appear on the original version of the book. I removed it and instead created a copy, because some of the modifications needed for the translation (the traduction of a couple of commands defined there) would have affected the english version. And we don't want that ;)
author jerojasro@localhost
date Sun, 19 Oct 2008 23:53:39 -0500
parents 04c08ad7e92e
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