# HG changeset patch
# User Phil Cohen <phillco@fb.com>
# Date 1502680012 25200
# Node ID db3e9f7c91aabb43a597b619fd48cd5e73d8ef9e
# Parent  b3571dc0e6b8ddc21d5ba9c13acf9dd08ffae74b
filemerge: pass contexts to simplemerge

Otherwise, this should be a no-op.

Differential Revision: https://phab.mercurial-scm.org/D373

diff -r b3571dc0e6b8 -r db3e9f7c91aa mercurial/filemerge.py
--- a/mercurial/filemerge.py	Sun Aug 13 20:06:52 2017 -0700
+++ b/mercurial/filemerge.py	Sun Aug 13 20:06:52 2017 -0700
@@ -341,7 +341,8 @@
                 labels = _defaultconflictlabels
             if len(labels) < 3:
                 labels.append('base')
-        r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels)
+        r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco,
+                                    quiet=True, label=labels, repo=repo)
         if not r:
             ui.debug(" premerge successful\n")
             return 0
@@ -371,7 +372,8 @@
 
     ui = repo.ui
 
-    r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode)
+    r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco,
+                                label=labels, mode=mode, repo=repo)
     return True, r, False
 
 @internaltool('union', fullmerge,
@@ -423,8 +425,9 @@
     assert localorother is not None
     tool, toolpath, binary, symlink = toolconf
     a, b, c, back = files
-    r = simplemerge.simplemerge(repo.ui, a, b, c, label=labels,
-                                localorother=localorother)
+    r = simplemerge.simplemerge(repo.ui, a, b, c, fcd, fca, fco,
+                                label=labels, localorother=localorother,
+                                repo=repo)
     return True, r
 
 @internaltool('merge-local', mergeonly, precheck=_mergecheck)