Mercurial > hg
view tests/test-conflict @ 511:9f67222186bd
Disallow merging of unrelated projects
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Disallow merging of unrelated projects
manifest hash: 40badbca64e1ccfd83fee8cd7bf5099f57b6f8bf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwZn6ywK+sNU5EO8RAmdeAJ9TAaGSe0nGMdL+Du3AGwm9x28IUgCgpfGG
UunOBkobMVLGdHegnOvQkmQ=
=VwVi
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 28 Jun 2005 10:42:02 -0800 |
parents | ee4c80d294e5 |
children | 3d4d5f2aba9a 4fc63e22b1fe |
line wrap: on
line source
#!/bin/bash set -x hg init echo "nothing" > a hg add a hg commit -t ancestor -u test -d "0 0" echo "something" > a hg commit -t branch1 -u test -d "0 0" hg co 0 echo "something else" > a hg commit -t branch2 -u test -d "0 0" export HGMERGE=merge hg -d up -m 1 hg id grep -Ev ">>>|<<<" a hg status