diff -r 0e0ac8f09048 -r 6330df9d6393 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Tue Aug 29 18:24:51 2017 +0200
+++ b/mercurial/filemerge.py	Fri Sep 01 10:35:43 2017 -0700
@@ -341,8 +341,7 @@
                 labels = _defaultconflictlabels
             if len(labels) < 3:
                 labels.append('base')
-        r = simplemerge.simplemerge(ui, fcd, fca, fco,
-                                    quiet=True, label=labels, repo=repo)
+        r = simplemerge.simplemerge(ui, fcd, fca, fco, quiet=True, label=labels)
         if not r:
             ui.debug(" premerge successful\n")
             return 0
@@ -371,8 +370,7 @@
     of merge, unless mode equals 'union' which suppresses the markers."""
     ui = repo.ui
 
-    r = simplemerge.simplemerge(ui, fcd, fca, fco,
-                                label=labels, mode=mode, repo=repo)
+    r = simplemerge.simplemerge(ui, fcd, fca, fco, label=labels, mode=mode)
     return True, r, False
 
 @internaltool('union', fullmerge,
@@ -423,9 +421,8 @@
     """
     assert localorother is not None
     tool, toolpath, binary, symlink = toolconf
-    r = simplemerge.simplemerge(repo.ui, fcd, fca, fco,
-                                label=labels, localorother=localorother,
-                                repo=repo)
+    r = simplemerge.simplemerge(repo.ui, fcd, fca, fco, label=labels,
+                                localorother=localorother)
     return True, r
 
 @internaltool('merge-local', mergeonly, precheck=_mergecheck)