tests/test-merge3
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 19 Feb 2006 18:59:20 +0100
changeset 1748 2428e6d66f06
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
bisect: fix for recent changes disallowing "false" merges

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "0 0"