diff mercurial/filemerge.py @ 49845:e0c0545e2e55

branching: merge stable into default

--- a/mercurial/filemerge.py	Tue Jan 03 11:53:35 2023 -0500
+++ b/mercurial/filemerge.py	Wed Jan 04 16:02:22 2023 +0100
@@ -1132,7 +1132,9 @@
         patterns = ui.configlist(section, b'%s.patterns' % name, [])
         is_match = True
         if patterns:
-            m = match.match(repo.root, b'', patterns)
+            m = match.match(
+                repo.root, b'', patterns, ctx=local.fctx.changectx()
+            )
             is_match = m(local.fctx.path())
         if is_match:
             if ui.configbool(section, b'%s.disable' % name):