tests/test-diffdir
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 25 Oct 2006 02:51:27 -0300
changeset 3506 9de0e64545a3
parent 3192 096f1c73cdc3
child 3822 000d122071b5
permissions -rwxr-xr-x
Test that we notice the empty files from the second parent during a merge This didn't work with 0.9.1, but was fixed by 05257fd28591.

#!/bin/sh

hg init
touch a
hg add a
hg ci -m "a" -d "1000000 0"

echo 123 > b
hg add b
hg diff --nodates

hg diff --nodates -r tip

echo foo > a
hg diff --nodates