Mercurial > hgbook

view es/examples/issue29 @ 654:b08f6a61bf15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Feb 2009 22:59:50 -0800 (2009-02-10)
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