view tests/test-conflict @ 361:88268aa2b8d2

Fix another sortdiff cornercase -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix another sortdiff cornercase manifest hash: 32b2d1750689c561c9471fb68a9f3571364399cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsL6AywK+sNU5EO8RAhaeAJ4zw18vo4oGTvymplKb7olKEeg0aQCfVxX1 2o/PcrE6EeboHpQn5E0Wb/Y= =eENW -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 15 Jun 2005 15:49:20 -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