hgmerge: various cleanups
Details:
- put temporary file names into variables
- make all temporary file names end with random part
- cleanup FileMerge handling
- do not use hardlinks in FileMerge change test (breaks on FAT)
- try harder to keep file mtime unchanged in case of failed merge
"""
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