Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 22706:ad25986c4cd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: introduce :x as short version of internal:x merge tool name "internal:" is so much typing - it is frequently specified on the command line and gives options that are longer than any other I have seen.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 28 Sep 2014 17:15:25 +0200
parents d7f25834ffbb
children 38e0363dcbe0
line wrap: on
line diff
--- a/mercurial/filemerge.py	Thu Oct 02 23:26:02 2014 +0900
+++ b/mercurial/filemerge.py	Sun Sep 28 17:15:25 2014 +0200
@@ -28,6 +28,7 @@
         fullname = 'internal:' + name
         func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip()
         internals[fullname] = func
+        internals[':' + name] = func
         func.trymerge = trymerge
         func.onfailure = onfailure
         return func