/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 bzr-handle-patch

  • Committer: Jelmer Vernooij
  • Date: 2010-02-28 15:19:15 UTC
  • mfrom: (674.1.1 bzr-gtk)
  • Revision ID: jelmer@samba.org-20100228151915-bvwflj8ongj2fwqd
Merge qense's indicator application work, but don't require appindicator to be installed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr-handle-patch
25
25
        try:
26
26
                directive = merge_directive.MergeDirective.from_lines(lines)
27
27
        except errors.NotAMergeDirective:
28
 
                controller = DiffController(path, lines, allow_dirty=True)
 
28
                controller = DiffController(path, lines)
29
29
        else:
30
30
                controller = MergeDirectiveController(path, directive)
31
31
        window = controller.window