view tests/simple-merge @ 195:b98bcf66dd9d

hgweb: make age() smarter -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: make age() smarter manifest hash: 3aa19b2960d81843e573a8ce79a242defeb80f6a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCm0JYywK+sNU5EO8RAvLUAKCJbWqvnzfirS64LbaWbBaWlkfbfACcCyGq Y9UMZRGDBGCEIVu9f/F/F6U= =+ULo -----END PGP SIGNATURE-----
author mpm@selenic.com
date Mon, 30 May 2005 08:42:00 -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