Mercurial > hg
diff mercurial/filemerge.py @ 26572:c7850af6bb75
filemerge._merge: drop no longer necessary 'if r:' check
Cleanup from an earlier patch to make premerge be directly called from the main
filemerge function.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Thu, 08 Oct 2015 14:16:19 -0700 |
| parents | f18646cf0e93 |
| children | a875773cf537 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Mon Oct 05 02:33:45 2015 -0700 +++ b/mercurial/filemerge.py Thu Oct 08 14:16:19 2015 -0700 @@ -247,15 +247,12 @@ files. It will fail if there are any conflicts and leave markers in the partially merged file. Markers will have two sections, one for each side of merge, unless mode equals 'union' which suppresses the markers.""" - r = 1 - if r: - a, b, c, back = files + a, b, c, back = files - ui = repo.ui + ui = repo.ui - r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode) - return True, r - return False, 0 + r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode) + return True, r @internaltool('union', fullmerge, _("merging %s incomplete! "