annotate contrib/favicon.ico @ 1647:64a1169c927d

Use of opendiff as merge program on MacOS X Hello, If one has the developer tools installed on MacOS X there's another alternative for the merge program. Invocation could be done somehow like in the attached patch for hgmerge.
author Christian Ebert <blacktrash@gmx.net>
date Sun, 29 Jan 2006 10:10:00 +1300
parents 0bf11906df28
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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)