Mercurial > hg > pyhgsh
view tests/test-conflict @ 448:20fc66131bc0
Minor packaging fixups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Minor packaging fixups
manifest hash: f588ece18c1e43697c4188d94ecb034e591913a1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuy7aywK+sNU5EO8RAoxdAJ4l8MRhmzBo15LPnk/kb11MbSYwMQCgrLuJ
o8LeT5YpTESNtXcKqA+2dxg=
=lcNo
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Thu, 23 Jun 2005 13:51:22 -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