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

[Kai Willadsen <kaiw src gnome org>]

commit a860b97af254faf1125f62227d0ce5ab9f203ffa
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Apr 24 06:59:34 2014 +1000

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

 meld/vcview.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/vcview.py b/meld/vcview.py
index a4c3a80..85ad449 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -489,7 +489,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
                 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: