Show More
@@ -38,6 +38,11 b' internals = {}' | |||||
38 | # Merge tools to document. |
|
38 | # Merge tools to document. | |
39 | internalsdoc = {} |
|
39 | internalsdoc = {} | |
40 |
|
40 | |||
|
41 | # internal tool merge types | |||
|
42 | nomerge = None | |||
|
43 | mergeonly = 'mergeonly' # just the full merge, no premerge | |||
|
44 | fullmerge = 'fullmerge' # both premerge and merge | |||
|
45 | ||||
41 | def internaltool(name, trymerge, onfailure=None, precheck=None): |
|
46 | def internaltool(name, trymerge, onfailure=None, precheck=None): | |
42 | '''return a decorator for populating internal merge tool table''' |
|
47 | '''return a decorator for populating internal merge tool table''' | |
43 | def decorator(func): |
|
48 | def decorator(func): |
General Comments 0
You need to be logged in to leave comments.
Login now