Show More
@@ -399,7 +399,7 b' def _underlyingfctxifabsent(filectx):' | |||
|
399 | 399 | return filectx |
|
400 | 400 | |
|
401 | 401 | |
|
402 |
def _premerge(repo, fcd, fco, fca, toolconf, backup, labels |
|
|
402 | def _premerge(repo, fcd, fco, fca, toolconf, backup, labels): | |
|
403 | 403 | tool, toolpath, binary, symlink, scriptfn = toolconf |
|
404 | 404 | if symlink or fcd.isabsent() or fco.isabsent(): |
|
405 | 405 | return 1 |
@@ -421,8 +421,6 b' def _premerge(repo, fcd, fco, fca, toolc' | |||
|
421 | 421 | ) |
|
422 | 422 | |
|
423 | 423 | if premerge: |
|
424 | if not labels: | |
|
425 | labels = _defaultconflictlabels | |
|
426 | 424 | if len(labels) < 3: |
|
427 | 425 | labels.append(b'base') |
|
428 | 426 | mode = b'merge' |
General Comments 0
You need to be logged in to leave comments.
Login now