view tests/simple-merge @ 265:7ca05593bd30

hgweb: fix non-existent source or destination for diff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: fix non-existent source or destination for diff manifest hash: c076bc00ba04911392085f3d0697106f4d24b808 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpJtjywK+sNU5EO8RAsaTAKCso0BDI3GQxN9ZZRNeMXjeZXCXLgCfYM+R JpTBR7gUZtV+pEexSfFlRDQ= =moF8 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Mon, 06 Jun 2005 10:52:19 -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