Mercurial > hgbook

view en/examples/issue29 @ 804:83540574ee49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed whitespace from URLs
author Raphael Borun Das Gupta <hg@raphael.dasgupta.ch>
date Sat, 18 Apr 2009 17:38:07 +0200
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