Mercurial > hg
view mercurial/i18n.py @ 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 | fbf2b10011aa |
children | 345bac2bc4ec |
line wrap: on
line source
""" i18n.py - internationalization support for mercurial Copyright 2005 Matt Mackall <mpm@selenic.com> This software may be used and distributed according to the terms of the GNU General Public License, incorporated herein by reference. """ # the import from gettext is _really_ slow # for now we use a dummy function gettext = lambda x: x #import gettext #t = gettext.translation('hg', '/usr/share/locale', fallback=1) #gettext = t.gettext