# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1516237792 18000
# Node ID c87926ebe096130eace38c3fbc57503ea64929b8
# Parent  553a98a436cfe9680de8f6249cfa399d46af2214
filemerge: fix regular expression pattern to be bytes

# skip-blame just a bytes prefix

Differential Revision: https://phab.mercurial-scm.org/D1888

diff -r 553a98a436cf -r c87926ebe096 mercurial/filemerge.py
--- 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"):