# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-10-11 22:04:00
# Node ID abb5ec3eb6ce66ed8eb1a44d4af6653e7649f822
# Parent  a38924f7680c6b7d95e14ade999c35748c9dcafd

filemerge: clean up some dead code

We now exit early if we do a premerge, so extra checks are no longer necessary.

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -522,12 +522,8 @@ def _filemerge(premerge, repo, mynode, o
             # 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)