[meld: 60/60] vc: Fix git's remerge helpers for py3k

[Kai Willadsen <kaiw src gnome org>]

commit c1d703f0ee61822fd2c32fbd5df83728a4045e60
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Jul 30 08:10:01 2016 +1000

    vc: Fix git's remerge helpers for py3k

 meld/vc/_vc.py |   10 +++++-----
 meld/vc/git.py |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 61130e7..d87628e 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -427,11 +427,11 @@ def call(cmd, cwd=None):
 
 
 base_re = re.compile(
-    r"^<{7}.*?$\r?\n(?P<local>.*?)"
-    r"^\|{7}.*?$\r?\n(?P<base>.*?)"
-    r"^={7}.*?$\r?\n(?P<remote>.*?)"
-    r"^>{7}.*?$\r?\n", flags=re.DOTALL | re.MULTILINE)
+    br"^<{7}.*?$\r?\n(?P<local>.*?)"
+    br"^\|{7}.*?$\r?\n(?P<base>.*?)"
+    br"^={7}.*?$\r?\n(?P<remote>.*?)"
+    br"^>{7}.*?$\r?\n", flags=re.DOTALL | re.MULTILINE)
 
 
 def base_from_diff3(merged):
-    return base_re.sub(r"==== BASE ====\n\g<base>==== BASE ====\n", merged)
+    return base_re.sub(br"==== BASE ====\n\g<base>==== BASE ====\n", merged)
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 7f86457..c36fbc3 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -187,7 +187,7 @@ class Vc(_vc.Vc):
         pre-merged result everywhere that has no conflict, and the
         common ancestor anywhere there *is* a conflict.
         """
-        proc = self.run("merge-file", "-p", "--diff3", local, base, remote)
+        proc = self.run("merge-file", "-p", "--diff3", local, base, remote, universal_newlines=False)
         vc_file = io.BytesIO(
             _vc.base_from_diff3(proc.stdout.read()))