Mercurial > hg
view tests/test-conflict @ 483:27f5569a5814
Updated TODO
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Updated TODO
manifest hash: c73376bc97920d14c8e29311a76313afd71ed457
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCvtiZW7P1GVgWeRoRAsdeAKCazz6dq6fiuq37FGsRKbavfW+4xwCeKbmG
N7HBvJ71yVTX45heHiSh8c8=
=AgqS
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 26 Jun 2005 17:32:25 +0100 |
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