Mercurial > hg
view tests/test-conflict @ 518:b0187336843c
Fix failed clone in current directory
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix failed clone in current directory
Spotted by Edouard Gomez.
manifest hash: 83fd3bb8056c531f2d696f00c5bd6a61274783eb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwu0jywK+sNU5EO8RAqPiAJ9tCL5PhHoGMTbaQzpt5dl+EkCH9QCgh4WL
EOFeD2th0Ucs7Npu3t+VUB0=
=p/Ig
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 29 Jun 2005 10:49:07 -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