Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: fix regular expression pattern to be bytes
authorAugie Fackler <augie@google.com>
Wed, 17 Jan 2018 20:09:52 -0500
changeset 35829 c87926ebe096
parent 35828 553a98a436cf
child 35830 e689d8b22728
filemerge: fix regular expression pattern to be bytes # skip-blame just a bytes prefix Differential Revision: https://phab.mercurial-scm.org/D1888
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- 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"):
Mercurial