tests/test-conflict
author mpm@selenic.com
Sun, 26 Jun 2005 15:09:37 -0800
changeset 474 b2ae8283d1a6
parent 392 ee4c80d294e5
child 544 3d4d5f2aba9a
child 547 4fc63e22b1fe
permissions -rwxr-xr-x
Minor speed improvements for bdiff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor speed improvements for bdiff Consolidate the jpos/jlen arrays to improve cache locality. Do the same for the hash head/length arrays. manifest hash: e6d9ed36782741b1d6fcce8c2d00155a9540e81d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvzWxywK+sNU5EO8RAlTMAJ9+yl0dKIeWv4RegeLy7g6wcnoYwgCgk6la ip6KEAyBb7ktsX14KyZ5+/s= =utNJ -----END PGP SIGNATURE-----

#!/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