Mercurial > public > mercurial-scm > hg-stable
diff mercurial/templatekw.py @ 25393:eb52de500d2a
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 01 Jun 2015 14:47:02 -0500 |
parents | 390a10b7843b ed18f4acf435 |
children | edd2d20ac687 |
line wrap: on
line diff
--- a/mercurial/templatekw.py Fri May 29 15:18:49 2015 -0700 +++ b/mercurial/templatekw.py Mon Jun 01 14:47:02 2015 -0500 @@ -111,7 +111,7 @@ def getfiles(repo, ctx, revcache): if 'files' not in revcache: - revcache['files'] = repo.status(ctx.p1().node(), ctx.node())[:3] + revcache['files'] = repo.status(ctx.p1(), ctx)[:3] return revcache['files'] def getlatesttags(repo, ctx, cache):