view es/examples/issue29 @ 574:22184eb4c965

finished the translation of the section "information for writers of hooks" updated project status
author Javier Rojas <jerojasro@devnull.li>
date Wed, 31 Dec 2008 11:31:04 -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