[meld] meldapp: Reorder tab creation to create the main comparison first

[Kai Willadsen <kaiw src gnome org>]

commit 5bbb7dfa1b61dec11413749117e9969dda173aee
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jun 7 08:41:24 2015 +1000

    meldapp: Reorder tab creation to create the main comparison first
    
    The rationale here is that the comparison specified with through normal
    (i.e., not --diff) args is the 'main' comparison, because it's the one
    you can apply extra flags to, and it's the one we should focus.

 meld/meldapp.py |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 86dc732..cc74e59 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -314,12 +314,11 @@ class MeldApp(Gtk.Application):
 
         tab = None
         error = None
-        comparisons = options.diff + [args]
+        comparisons = [args] + options.diff
         options.newtab = options.newtab or not command_line.get_is_remote()
         for i, paths in enumerate(comparisons):
             files = [make_file_from_command_line(p) for p in paths]
-            auto_merge = (
-                options.auto_merge if i == len(comparisons) - 1 else False)
+            auto_merge = options.auto_merge and i == 0
             try:
                 for p, f in zip(paths, files):
                     if f.get_path() is None: