tests/test-conflict
author Matt Mackall <mpm@selenic.com>
Mon, 11 Feb 2008 16:13:43 -0600
changeset 6074 59a9dc9562e2
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
ignore: split up huge patterns Some versions of Python silently mishandle large regexes, so split them up at a conservative 20k.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status