/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Aaron Bentley
  • Date: 2008-01-15 07:18:53 UTC
  • Revision ID: aaron@aaronbentley.com-20080115071853-eb9ky0iq99prhssk
Get merging working

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
686
686
            window = DiffWindow()
687
687
            window.set_diff_text(path, lines)
688
688
        else:
689
 
            window = MergeDirectiveWindow()
 
689
            window = MergeDirectiveWindow(directive)
690
690
            window.set_diff_text(path, directive.patch.splitlines(True))
691
691
        window.show()
692
692
        gtk = self.open_display()