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
Showing
- hgext/extdiff.py 3 additions, 0 deletionshgext/extdiff.py
- tests/test-extdiff 10 additions, 1 deletiontests/test-extdiff
- tests/test-extdiff.out 7 additions, 0 deletionstests/test-extdiff.out
- tests/test-merge1 8 additions, 0 deletionstests/test-merge1
- tests/test-merge1.out 26 additions, 0 deletionstests/test-merge1.out
Please register or sign in to comment