tests/test-merge3
author Matt Mackall <mpm@selenic.com>
Fri, 28 May 2010 14:41:11 -0500
branchstable
changeset 11227 054549ccb680
parent 1933 7544700fd931
child 11177 6a64813276ed
permissions -rwxr-xr-x
status: avoid performance regression when no .hgsub is present (introduced by 24ce8f0c0a39)

#!/bin/sh

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