merge: indent to prepare for next patch

mercurial/merge.py

@@ -415,6 +415,7 b' def manifestmerge(repo, wctx, p2, pa, br'
         if partial and not partial(f):
             continue
         if n1 and n2:
+            if True:
             fa = f
             a = ma.get(f, nullid)
             if a == nullid: