filemerge: deindent the parts of filemerge outside the try block

It is no longer necessary to indent these parts.

mercurial/filemerge.py

@@ -448,7 +448,6 b' def _filemerge(premerge, repo, mynode, o'
     Returns whether the merge is complete, and the return value of the merge.
     """
 
-    if True:
         def temp(prefix, ctx):
             pre = "%s~%s." % (os.path.basename(ctx.path()), prefix)
             (fd, name) = tempfile.mkstemp(prefix=pre)