view tests/simple-merge @ 169:e93a16de0c66

hgweb: actually commit the tags template
author mpm@selenic.com
date Thu, 26 May 2005 13:02:04 -0800
parents 9f64ee817199
children
line wrap: on
line source

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