add merge command. means same thing as "update -m".
repo.addchangegroup method now returns number of heads modified and added,
so command line can tell whether update or merge needed. this makes
tiny change to ssh wire protocol, but change is backwards compatible.
pull command now returns 0 if no changes to pull.
"""
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