tests/simple-merge
author mpm@selenic.com
Thu, 26 May 2005 09:56:20 -0800
changeset 164 2e87f04880ab
parent 28 9f64ee817199
permissions -rw-r--r--
Make fancyopts handle no arguments This lets hg serve work with no args.

set -ex
export EDITOR=true
rm -rf test branch

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit
hg verify
cd ..

cp -a test branch
cd branch
echo bar>>foo
hg commit

cd ../test
hg merge ../branch
hg verify