vcview: Hook up merge order preference (bgo#699030)

Author: kaiw

meld/vcview.py

@@ -489,7 +489,7 @@ def run_diff(self, path):
                 hasattr(self.vc, 'get_path_for_conflict'):
             # We create new temp files for other, base and this, and
             # then set the output to the current file.
-            if left_is_local:
+            if self.props.merge_file_order == "local-merge-remote":
                 conflicts = (tree.CONFLICT_THIS, tree.CONFLICT_MERGED,
                              tree.CONFLICT_OTHER)
             else: