Mercurial > hg
annotate contrib/favicon.ico @ 3311:966632304dde
merge: shortcircuit filemerge for identical files
- use filectx.cmp to compare files
- move merge messages into filemerge
- kill the redundant resolving message
- update tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 10 Oct 2006 01:16:06 -0500 |
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) |