view tests/simple-merge @ 186:9a2075c0b9b8

Add $HGEDITOR hook and example script -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add $HGEDITOR hook and example script This hook makes signing commits easier. manifest hash: ba8723e4b52323528dfa681a58658a5b4b2c02e4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmONFywK+sNU5EO8RAj87AKCEa5r9EepdYPiYRGo/jAjjwCIcVACfeBPe QDInXr7karo6/P8d2bM/tVU= =rxIQ -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 28 May 2005 13:31:49 -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