Mercurial > hg

view tests/test-conflict @ 699:64046575a6f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed duplicate use of os.path.normcase(). -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Removed duplicate use of os.path.normcase(). manifest hash: cccacfb66a4de9abc20095b28e6bab9b51dc4fa9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1n0LW7P1GVgWeRoRAueGAJ9256Jiwv4QbrFIV3Px/SmBMkddjQCbBop/ J2Yi2np72OAKVPhFhCijH6s= =aAyf -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 14 Jul 2005 15:56:11 +0100
parents eb46971fc57f
children 7e4843b7efd2
line wrap: on
line source

#!/bin/sh

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 up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status