vc.git: Fix bad argument

Author: kaiw

meld/vc/git.py

@@ -187,7 +187,9 @@ def remerge_with_ancestor(self, local, base, remote):
         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()))