tests/test-diffdir
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 23 Jul 2005 17:14:05 +0100
changeset 792 49ec802b4a16
parent 749 7e4843b7efd2
child 774 6592c4f5cd4f
child 793 445970ccf57a
permissions -rwxr-xr-x
Added tests for bug with three-way-merging of old tip, tip and cwd.

#!/bin/sh

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

echo 123 > b
hg add b
hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/"

hg diff -r tip | sed "s/\(\(---\|+++\).*\)\t.*/\1/"