Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add some merge types
authorSiddharth Agarwal <sid0@fb.com>
Wed, 07 Oct 2015 15:13:41 -0700
changeset 26525 abc2327e382a
parent 26524 61c295d9d402
child 26526 7fa3560443fd
filemerge: add some merge types We're going to turn the 'trymerge' boolean into a 'mergetype' enum with these three possible values.
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- 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):
mercurial