Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 532:2e9698a5c92c
clone: abort on pre-existing destination directory
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
clone: abort on pre-existing destination directory
manifest hash: c1c205ea212ed73521cebe0524da364f40ebf387
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxCIjywK+sNU5EO8RArteAKCM7oPK+htBvhz7n0Eo//A1BuGRQwCfY1xL
7denU7OqsKUf9UKKkhbWLB8=
=rhfi
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Thu, 30 Jun 2005 08:47:31 -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