tests/test-diffdir
author mpm@selenic.com
Sat, 23 Jul 2005 10:00:56 -0500
changeset 768 20e95c245bc3
parent 749 7e4843b7efd2
child 774 6592c4f5cd4f
child 793 445970ccf57a
permissions -rwxr-xr-x
Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH

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