# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2018-07-27 21:49:45
# Node ID e252f136b9488e0d31f478e3975dfb5a959db1a0
# Parent  afc4ad706f9ccb89c2130d3f6de5dd79430541a8

amend: use ctx1.status(ctx2) instead of repo.status(ctx1, ctx2)

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

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -2428,7 +2428,7 @@ def amend(ui, repo, old, extra, pats, op
         if len(old.parents()) > 1:
             # ctx.files() isn't reliable for merges, so fall back to the
             # slower repo.status() method
-            files = set([fn for st in repo.status(base, old)[:3]
+            files = set([fn for st in base.status(old)[:3]
                          for fn in st])
         else:
             files = set(old.files())