Mercurial > hg > mercurial-crew-with-dirclash
diff Makefile @ 3328:49966b5ab16f
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
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 11 Oct 2006 16:35:09 +0200 |
| parents | c51fad25e59e |
| children | 2ab464771b7d 1a7794525c2b |