Show More
@@ -522,12 +522,8 b' def _filemerge(premerge, repo, mynode, o' | |||||
522 | # complete if premerge successful (r is 0) |
|
522 | # complete if premerge successful (r is 0) | |
523 | return not r, r |
|
523 | return not r, r | |
524 |
|
524 | |||
525 | if not r: # premerge successfully merged the file |
|
525 | needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, files, | |
526 | needcheck = False |
|
526 | labels=labels) | |
527 | else: |
|
|||
528 | needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, |
|
|||
529 | files, labels=labels) |
|
|||
530 |
|
||||
531 | if needcheck: |
|
527 | if needcheck: | |
532 | r = _check(r, ui, tool, fcd, files) |
|
528 | r = _check(r, ui, tool, fcd, files) | |
533 |
|
529 |
General Comments 0
You need to be logged in to leave comments.
Login now