Skip to content
Snippets Groups Projects
Commit ef21a2c41629 authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

filemerge: add a wrapper around the filemerge function

We'll introduce a separate premerge function that calls the same code.
parent a3fcc8e3136b
No related branches found
No related tags found
No related merge requests found
......@@ -102,7 +102,7 @@
overrides.mergerecordupdates)
entry = extensions.wrapfunction(merge, 'update',
overrides.mergeupdate)
entry = extensions.wrapfunction(filemerge, 'filemerge',
entry = extensions.wrapfunction(filemerge, '_filemerge',
overrides.overridefilemerge)
entry = extensions.wrapfunction(cmdutil, 'copy',
overrides.overridecopy)
......
......@@ -435,7 +435,7 @@
newlabels.append(_formatconflictmarker(repo, ca, tmpl, labels[2], pad))
return newlabels
def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
def _filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
"""perform a 3-way merge in the working directory
mynode = parent node before merge
......@@ -567,5 +567,8 @@
return r
def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
return _filemerge(repo, mynode, orig, fcd, fco, fca, labels=labels)
# tell hggettext to extract docstrings from these functions:
i18nfunctions = internals.values()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment