[meld] vc.git: Fix bad argument

[Kai Willadsen <kaiw src gnome org>]

commit e4506044b26b190a6465bd3985528c756d637211
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Mar 13 07:07:48 2017 +1000

    vc.git: Fix bad argument

 meld/vc/git.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index c36fbc3..6326dba 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -187,7 +187,9 @@ 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, universal_newlines=False)
+        proc = self.run(
+            "merge-file", "-p", "--diff3", local, base, remote,
+            use_locale_encoding=False)
         vc_file = io.BytesIO(
             _vc.base_from_diff3(proc.stdout.read()))