[Yum] [PATCH 2/3] Change order of files when merging externally --> merge left to right

[rocketraman at fastmail.fm]

From: Raman Gupta <raman at rocketraman.com>

---
 plugins/merge-conf/merge-conf.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/merge-conf/merge-conf.py b/plugins/merge-conf/merge-conf.py
index 39c2f45..201efac 100644
--- a/plugins/merge-conf/merge-conf.py
+++ b/plugins/merge-conf/merge-conf.py
@@ -160,10 +160,10 @@ def mergeConfFiles(pkg, fn, noreplace, conduit, has_prog):
         elif answer == "q":
             print "Choosing RPM's default action."
         elif answer == "m" and has_prog["meld"]:
-            os.system("""meld '%s' '%s'""" % (final_file, other_file))
+            os.system("""meld '%s' '%s'""" % (other_file, final_file))
             break
         elif answer == "v" and has_prog["vimdiff"]:
-            os.system("""vimdiff '%s' '%s'""" % (final_file, other_file))
+            os.system("""vimdiff '%s' '%s'""" % (other_file, final_file))
             break
         else:
             print "Unknown answer, please try again"
-- 
1.7.4.4