view en/examples/issue29 @ 607:c054534808e6

translated a bunch of definitions, index entries and latex commands
author Javier Rojas <jerojasro@devnull.li>
date Mon, 12 Jan 2009 16:46:25 -0500
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