Mercurial > hg
changeset 35829:c87926ebe096
filemerge: fix regular expression pattern to be bytes
# skip-blame just a bytes prefix
Differential Revision: https://phab.mercurial-scm.org/D1888
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 17 Jan 2018 20:09:52 -0500 |
parents | 553a98a436cf |
children | e689d8b22728 |
files | mercurial/filemerge.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Wed Jan 17 20:09:10 2018 -0500 +++ b/mercurial/filemerge.py Wed Jan 17 20:09:52 2018 -0500 @@ -529,7 +529,7 @@ out = a a = repo.wvfs.join(back.path()) replace = {'local': a, 'base': b, 'other': c, 'output': out} - args = util.interpolate(r'\$', replace, args, + args = util.interpolate(br'\$', replace, args, lambda s: util.shellquote(util.localpath(s))) cmd = toolpath + ' ' + args if _toolbool(ui, tool, "gui"):