tests/simple-merge
author mpm@selenic.com
Tue, 07 Jun 2005 00:21:53 -0800
changeset 271 35acefbf0ae6
parent 28 9f64ee817199
permissions -rw-r--r--
hgweb: ignore pipe errors -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: ignore pipe errors manifest hash: 3a3baaa175a422bf499f414b5186ed551827db56 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpVkhywK+sNU5EO8RAo5aAJ9KPR/Gwp8YBswhyKqzVYVlgBl49ACghr65 sGKxB7ctoX9XB1WDht8WUzk= =J2bp -----END PGP SIGNATURE-----

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