fix traceback of extdiff after a merge - files that comes from a different branch are marked as modified but aren't present in the original manifest - add a testcase for extdiff and for regular diff

#!/bin/sh

mkdir a
cd a
hg init
echo foo > b
hg add b
hg ci -m "b" -d "1000000 0"

chmod -w .hg

cd ..

hg clone a b

chmod +w a/.hg # let test clean up

cd b
hg verify