merge: fix stupid indentation left over from previous refactorings

mercurial/merge.py

@@ -567,7 +567,6 b' def batchremove(repo, actions):'
     i = 0
     for f, args, msg in actions:
         repo.ui.debug(" %s: %s -> r\n" % (f, msg))
-        if True:
             if verbose:
                 repo.ui.note(_("removing %s\n") % f)
             audit(f)
@@ -596,7 +595,6 b' def batchget(repo, mctx, actions):'
     i = 0
     for f, args, msg in actions:
         repo.ui.debug(" %s: %s -> g\n" % (f, msg))
-        if True:
             if verbose:
                 repo.ui.note(_("getting %s\n") % f)
             wwrite(f, fctx(f).data(), args[0])
@@ -626,7 +624,6 b' def applyupdates(repo, actions, wctx, mc'
 
     # prescan for merges
     for f, args, msg in actions['m']:
-        if True:
             f1, f2, fa, move, anc = args
             if f == '.hgsubstate': # merged internally
                 continue
@@ -677,8 +674,6 b' def applyupdates(repo, actions, wctx, mc'
     if [a for a in actions['g'] if a[0] == '.hgsubstate']:
         subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
 
-    if True:
-
         # forget (manifest only, just log it) (must come first)
         for f, args, msg in actions['f']:
             repo.ui.debug(" %s: %s -> f\n" % (f, msg))
@@ -848,7 +843,6 b' def calculateupdates(repo, wctx, mctx, a'
         repo.ui.note(_('end of auction\n\n'))
 
     # Prompt and create actions. TODO: Move this towards resolve phase.
-    if True:
         for f, args, msg in actions['cd']:
             if repo.ui.promptchoice(
                 _("local changed %s which remote deleted\n"
@@ -877,7 +871,6 b' def calculateupdates(repo, wctx, mctx, a'
 
 def recordupdates(repo, actions, branchmerge):
     "record merge actions to the dirstate"
-    if True:
         # remove (must come first)
         for f, args, msg in actions['r']:
             if branchmerge: