Mercurial > hg

diff mercurial/logcmdutil.py @ 46498:3caa3698335e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log: respect diff.merge in -p output Differential Revision: https://phab.mercurial-scm.org/D9958
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 04 Feb 2021 13:32:11 -0800
parents 4a012e531066
children 6f4a481f182a
line wrap: on
line diff
--- a/mercurial/logcmdutil.py	Thu Feb 04 13:21:01 2021 -0800
+++ b/mercurial/logcmdutil.py	Thu Feb 04 13:32:11 2021 -0800
@@ -247,7 +247,7 @@
             ui,
             ctx.repo(),
             diffopts,
-            ctx.p1(),
+            diff_parent(ctx),
             ctx,
             match=self._makefilematcher(ctx),
             stat=stat,