Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 456:d6ac88a738c4
More FAQ bits.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
More FAQ bits.
manifest hash: dd8aa534d3e72aa33f4fd7270d3750cefc2c40a9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCu54aywK+sNU5EO8RAud5AJ4699rQiuiZ2TKdZzkG6iGU/UaG8wCgr4Jz
euPp7E7arLNoOYtzCbGCSks=
=l3sX
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Thu, 23 Jun 2005 21:46:02 -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