Mercurial > hg
view tests/test-conflict @ 377:e5d769afd3ef
Merge with TAH
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with TAH
manifest hash: f73215065ecbcfd9a0d0964de5ed73a392837a56
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsQqNywK+sNU5EO8RAiuOAJ4lL23LcxAkbPHy33snasBgrkhNxQCgkBLO
ohB0/EA2dAvQtu5sMSW03D8=
=lF8D
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 15 Jun 2005 21:13:49 -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