Mercurial > hg > mercurial-crew-with-dirclash
annotate contrib/favicon.ico @ 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 | 0bf11906df28 |
children |
rev | line source |
---|---|
1277
0bf11906df28
Add a favicon.ico, small version of the main HG image.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
diff
changeset
|
1 (binary:image/vnd.microsoft.icon) |