Show More
@@ -388,16 +388,13 b' def filemerge(repo, mynode, orig, fcd, f' | |||||
388 | ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) |
|
388 | ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) | |
389 |
|
389 | |||
390 | markerstyle = ui.config('ui', 'mergemarkers', 'basic') |
|
390 | markerstyle = ui.config('ui', 'mergemarkers', 'basic') | |
391 | if markerstyle == 'basic': |
|
391 | if not labels: | |
392 |
|
|
392 | labels = _defaultconflictlabels | |
393 | else: |
|
393 | if markerstyle != 'basic': | |
394 | if not labels: |
|
394 | labels = _formatlabels(repo, fcd, fco, labels) | |
395 | labels = _defaultconflictlabels |
|
|||
396 |
|
||||
397 | formattedlabels = _formatlabels(repo, fcd, fco, labels) |
|
|||
398 |
|
395 | |||
399 | needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, |
|
396 | needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, | |
400 |
(a, b, c, back), labels= |
|
397 | (a, b, c, back), labels=labels) | |
401 | if not needcheck: |
|
398 | if not needcheck: | |
402 | if r: |
|
399 | if r: | |
403 | if onfailure: |
|
400 | if onfailure: |
General Comments 0
You need to be logged in to leave comments.
Login now