[meld] Reinstate -u option for SVN compatibility (closes bgo#648460, 648474)

[Kai Willadsen <kaiw src gnome org>]

commit 9c04b896dfa8d330c71d526f121dc6ddf2823816
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Apr 23 22:09:32 2011 +1000

    Reinstate -u option for SVN compatibility (closes bgo#648460, 648474)

 meld/meldapp.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 98a9822..0bc6f74 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -166,6 +166,8 @@ class MeldApp(gobject.GObject):
             help=_("Set label to use instead of file name"))
         parser.add_option("-a", "--auto-compare", action="store_true", default=False,
             help=_("Automatically compare all differing files on startup"))
+        parser.add_option("-u", "--unified", action="store_true",
+                          help=_("Ignored for compatibility"))
         parser.add_option("-o", "--output", action="store", type="string",
             dest="outfile", default=None,
             help=_("Set the target file for saving a merge result"))