Mercurial > hg
view tests/test-conflict @ 367:73ea73ab3359
Use errno.EPIPE rather than 32
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Use errno.EPIPE rather than 32
manifest hash: c9cb2fadf7ef4392b2f16b3f76ca2a39964b7ae0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsNNOywK+sNU5EO8RAudrAKCGKfgsHmSLdt5HYpUtX4S/QSFCQgCeKb7M
Qld4CLe1M3aktU0tugb51Gs=
=1LB7
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 15 Jun 2005 17:18:06 -0800 |
parents | f69a5d2d4fe1 |
children | ee4c80d294e5 |
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 cat a | grep -v ">>>" | grep -v "<<<" hg status