Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 25835:34ffe4c29782

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: mark internal-only config option
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jun 2015 17:46:55 -0500
parents fd7287f0b43c
children 80aba76e29c1
comparison
equal deleted inserted replaced
25834:aca8ae2b0cb2 25835:34ffe4c29782
73 ui.warn(_("tool %s requires a GUI\n") % tmsg) 73 ui.warn(_("tool %s requires a GUI\n") % tmsg)
74 else: 74 else:
75 return True 75 return True
76 return False 76 return False
77 77
78 # internal config: ui.forcemerge
78 # forcemerge comes from command line arguments, highest priority 79 # forcemerge comes from command line arguments, highest priority
79 force = ui.config('ui', 'forcemerge') 80 force = ui.config('ui', 'forcemerge')
80 if force: 81 if force:
81 toolpath = _findtool(ui, force) 82 toolpath = _findtool(ui, force)
82 if toolpath: 83 if toolpath: