equal
deleted
inserted
replaced
433 _formatconflictmarker(repo, co, tmpl, labels[1], pad)] |
433 _formatconflictmarker(repo, co, tmpl, labels[1], pad)] |
434 if len(labels) > 2: |
434 if len(labels) > 2: |
435 newlabels.append(_formatconflictmarker(repo, ca, tmpl, labels[2], pad)) |
435 newlabels.append(_formatconflictmarker(repo, ca, tmpl, labels[2], pad)) |
436 return newlabels |
436 return newlabels |
437 |
437 |
438 def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None): |
438 def _filemerge(repo, mynode, orig, fcd, fco, fca, labels=None): |
439 """perform a 3-way merge in the working directory |
439 """perform a 3-way merge in the working directory |
440 |
440 |
441 mynode = parent node before merge |
441 mynode = parent node before merge |
442 orig = original local filename before merge |
442 orig = original local filename before merge |
443 fco = other file context |
443 fco = other file context |
565 if _toolbool(ui, tool, "fixeol"): |
565 if _toolbool(ui, tool, "fixeol"): |
566 _matcheol(a, back) |
566 _matcheol(a, back) |
567 |
567 |
568 return r |
568 return r |
569 |
569 |
|
570 def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None): |
|
571 return _filemerge(repo, mynode, orig, fcd, fco, fca, labels=labels) |
|
572 |
570 # tell hggettext to extract docstrings from these functions: |
573 # tell hggettext to extract docstrings from these functions: |
571 i18nfunctions = internals.values() |
574 i18nfunctions = internals.values() |