Mercurial > hg
diff mercurial/cmdutil.py @ 18031:54f063acc5ea
merge with stable
author | Kevin Bullock <kbullock@ringworld.org> |
---|---|
date | Tue, 04 Dec 2012 11:19:32 -0600 |
parents | c8ffde272653 0c10cf819146 |
children | ae663cba9a8d |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Mon Dec 03 13:17:01 2012 -0800 +++ b/mercurial/cmdutil.py Tue Dec 04 11:19:32 2012 -0600 @@ -627,7 +627,7 @@ # subpath. The best we can do is to ignore it. tempnode2 = None submatch = matchmod.narrowmatcher(subpath, match) - sub.diff(diffopts, tempnode2, submatch, changes=changes, + sub.diff(ui, diffopts, tempnode2, submatch, changes=changes, stat=stat, fp=fp, prefix=prefix) class changeset_printer(object):