filemerge: clean up some dead code
We now exit early if we do a premerge, so extra checks are no longer necessary.
--- a/mercurial/filemerge.py Mon Oct 12 14:15:04 2015 -0400
+++ b/mercurial/filemerge.py Sun Oct 11 15:04:00 2015 -0700
@@ -522,12 +522,8 @@
# complete if premerge successful (r is 0)
return not r, r
- if not r: # premerge successfully merged the file
- needcheck = False
- else:
- needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf,
- files, labels=labels)
-
+ needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, files,
+ labels=labels)
if needcheck:
r = _check(r, ui, tool, fcd, files)