tests/test-diffdir
author Matt Mackall <mpm@selenic.com>
Fri, 06 Oct 2006 16:55:11 -0500
changeset 3280 ae85272b59a4
parent 3192 096f1c73cdc3
child 3822 000d122071b5
permissions -rwxr-xr-x
merge: copy fixes and tests Fix up "already seen" logic Fix merge action in remote copy case Add status message Add lots of merge+copy/move test cases

#!/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