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

     1

#!/bin/sh

     2

     3

hg init

     4

hg log

     5

hg grep wah

     6

hg manifest

     7

hg verify