Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 35458:786289423e97
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Tue, 19 Dec 2017 16:27:24 -0500 |
parents | 8a0cac20a1ad 058c725925e3 |
children | 5bec509dc1ff |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Mon Dec 18 15:18:37 2017 -0800 +++ b/mercurial/cmdutil.py Tue Dec 19 16:27:24 2017 -0500 @@ -1515,7 +1515,7 @@ match.uipath(matchroot), uirelroot)) if stat: - diffopts = diffopts.copy(context=0) + diffopts = diffopts.copy(context=0, noprefix=False) width = 80 if not ui.plain(): width = ui.termwidth()