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
hg init a
echo a > a/a
hg --cwd a ci -Ama
hg clone a c
hg clone a b
echo b >> b/a
hg --cwd b ci -mb
echo % push should push to default when default-push not set
hg --cwd b push | sed 's/pushing to.*/pushing/'
echo % push should push to default-push when set
echo 'default-push = ../c' >> b/.hg/hgrc
hg --cwd b push | sed 's/pushing to.*/pushing/'