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

#!/usr/bin/env python
#

import doctest

import mercurial.changelog
# test doctest from changelog

doctest.testmod(mercurial.changelog)