Mercurial > hg

view tests/simple-merge @ 313:e75ea4662d81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor caching improvement for manifest -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor caching improvement for manifest manifest hash: 91d827f4041f1151875a52199618cdd1a219ac79 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrGGBywK+sNU5EO8RAotVAJ93JTk6XoHnZrbGzcZQ1N+P7kNKiACfYj+F RlcmcLHc3rEMkcM127BszDg= =5zAN -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sun, 12 Jun 2005 08:23:29 -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