tests/simple-merge
author jake@edge2.net
Tue, 24 May 2005 16:08:09 -0700
changeset 154 1d5f799ebe1e
parent 28 9f64ee817199
permissions -rw-r--r--
fixed problem with head/body tags, added dtd, fixed table attributes add quotes around all attributes (w3c recommendation) pages pass w3c validator

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