--- a/tests/test-context.py	Thu Jun 28 16:11:13 2018 +0200
+++ b/tests/test-context.py	Sat Jun 23 13:26:23 2018 +0100
@@ -10,6 +10,7 @@
     scmutil,
     ui as uimod,
 )
+from mercurial.utils import diffutil
 
 print_ = print
 def print(*args, **kwargs):
@@ -76,8 +77,8 @@
 print(ctxb.status(ctxa))
 
 # test performing a diff on a memctx
-
-for d in ctxb.diff(ctxa, opts={'git': True}):
+diffopts = diffutil.diffopts(repo.ui, {'git': True})
+for d in ctxb.diff(ctxa, opts=diffopts):
     printb(d, end=b'')
 
 # test safeness and correctness of "ctx.status()"