filemerge: indent filemerge.filemerge

This will make upcoming patches much easier to review.

mercurial/filemerge.py

@@ -441,6 +441,7 b' def filemerge(repo, mynode, orig, fcd, f'
     fcd = local file context for current/destination file
     """
 
+    if True:
     def temp(prefix, ctx):
         pre = "%s~%s." % (os.path.basename(ctx.path()), prefix)
         (fd, name) = tempfile.mkstemp(prefix=pre)
@@ -521,7 +522,8 b' def filemerge(repo, mynode, orig, fcd, f'
             r = 1
 
     if not r and not checked and (_toolbool(ui, tool, "checkchanged") or
-                                  'changed' in _toollist(ui, tool, "check")):
+                                      'changed' in
+                                      _toollist(ui, tool, "check")):
         if filecmp.cmp(a, back):
             if ui.promptchoice(_(" output file %s appears unchanged\n"
                                  "was merge successful (yn)?"