--- a/tests/failfilemerge.py	Tue Aug 09 09:15:46 2016 -0700
+++ b/tests/failfilemerge.py	Fri Aug 12 06:01:42 2016 -0700
@@ -9,7 +9,7 @@
 )
 
 def failfilemerge(filemergefn,
-        premerge, repo, mynode, orig, fcd, fco, fca, labels=None):
+                  premerge, repo, mynode, orig, fcd, fco, fca, labels=None):
     raise error.Abort("^C")
     return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)