--- a/mercurial/filemerge.py	Thu Oct 08 01:41:30 2015 +0900
+++ b/mercurial/filemerge.py	Wed Oct 07 15:13:41 2015 -0700
@@ -38,6 +38,11 @@
 # Merge tools to document.
 internalsdoc = {}
 
+# internal tool merge types
+nomerge = None
+mergeonly = 'mergeonly'  # just the full merge, no premerge
+fullmerge = 'fullmerge'  # both premerge and merge
+
 def internaltool(name, trymerge, onfailure=None, precheck=None):
     '''return a decorator for populating internal merge tool table'''
     def decorator(func):