Mercurial > hg
view tests/test-conflict @ 544:3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Remove bashisms and use /bin/sh instead of /bin/bash.
manifest hash: 25560e04ff8ac33a6d8b82d2328b4e90578bee4c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCxOEjW7P1GVgWeRoRAm9XAJ9IjlbMerPYEhKQQu7Ufcm6630cDwCfdXJ3
865XH6YVMuCYNjf3eibwQaM=
=r3gh
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 01 Jul 2005 07:22:27 +0100 |
parents | ee4c80d294e5 |
children | 4fc63e22b1fe |
line wrap: on
line source
#!/bin/sh 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