tests/test-diffdir
author Brendan Cully <brendan@kublai.com>
Thu, 23 Aug 2007 22:45:41 -0700
changeset 5223 3786ef8877d5
parent 4208 f80cf8b7bbd9
permissions -rwxr-xr-x
imerge: add automerge flag to attempt to batch merge all conflicts

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

hg diff -r ""
hg diff -r tip -r ""

true