# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1550056697 -28800
# Node ID 4baf81dd2193944030090b7467268c9e8ba27abd
# Parent  5bca2c579b05e674775b736e1b3872b5e0d61da0# Parent  3722557b008cc153e095afeaf3f48256e1d5f300
branching: merge with stable

diff -r 5bca2c579b05 -r 4baf81dd2193 hgext3rd/evolve/obshistory.py
--- a/hgext3rd/evolve/obshistory.py	Fri Feb 08 17:52:49 2019 +0100
+++ b/hgext3rd/evolve/obshistory.py	Wed Feb 13 19:18:17 2019 +0800
@@ -601,8 +601,7 @@
             matchfn = scmutil.matchall(repo)
             firstline = True
             for chunk, label in patch.diffui(repo, node, succ, matchfn,
-                                             changes=None, opts=diffopts,
-                                             prefix='', relroot=''):
+                                             opts=diffopts):
                 if firstline:
                     fm.plain('\n')
                     firstline = False
@@ -738,8 +737,7 @@
             matchfn = scmutil.matchall(repo)
             firstline = True
             for chunk, label in patch.diffui(repo, node, succ, matchfn,
-                                             changes=None, opts=diffopts,
-                                             prefix='', relroot=''):
+                                             opts=diffopts):
                 if firstline:
                     fm.plain('\n')
                     firstline = False