Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 462:512d76558bd4
Fix pipe timing for copy test
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix pipe timing for copy test
manifest hash: 75c389c84f4edacdd9163b6e5234f3ea334ca4b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvQEDywK+sNU5EO8RAtGDAJ0QKBXRg8qQ/Vkye9xEatVUREtU1ACcCISd
cJDQzk62ukLW2/gcCLOHHMQ=
=tpar
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 24 Jun 2005 23:00:19 -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