Esempio n. 1
0
 def append_filemerge(self, gfiles, merge_output=None):
     if len(gfiles) != 3:
         raise ValueError(
             _("Need three files to auto-merge, got: %r") %
             [f.get_parse_name() for f in gfiles])
     doc = FileMerge(len(gfiles))
     self._append_page(doc, "text-x-generic")
     doc.set_files(gfiles)
     if merge_output is not None:
         doc.set_merge_output_file(merge_output)
     return doc
Esempio n. 2
0
 def append_filemerge(self, gfiles, merge_output=None):
     if len(gfiles) != 3:
         raise ValueError(
             _("Need three files to auto-merge, got: %r") %
             [f.get_parse_name() for f in gfiles])
     doc = FileMerge(len(gfiles))
     self._append_page(doc, "text-x-generic")
     doc.set_files(gfiles)
     if merge_output is not None:
         doc.set_merge_output_file(merge_output)
     return doc