hgext/__init__.py
author Christian Ebert <blacktrash@gmx.net>
Sun, 29 Jan 2006 10:10:00 +1300
changeset 1647 64a1169c927d
parent 1360 7d439981bec4
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1360
7d439981bec4 Re-add hgext/__init__.py
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     1
# placeholder