[meld/meld-3-14] filediff: Fix incorrect signature for merge-all callback (bgo#753097)

[Kai Willadsen <kaiw src gnome org>]

commit 667261bbcfe883d1469c4b936e047ffd448bcde9
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Aug 1 07:23:04 2015 +1000

    filediff: Fix incorrect signature for merge-all callback (bgo#753097)

 meld/filediff.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 8f866b4..787c989 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -640,7 +640,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         src, dst = self.get_action_panes(PANE_RIGHT, reverse=True)
         self.pull_all_non_conflicting_changes(src, dst)
 
-    def merge_all_non_conflicting_changes(self):
+    def merge_all_non_conflicting_changes(self, *args):
         dst = 1
         merger = merge.Merger()
         merger.differ = self.linediffer