/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 conflicts.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2008-03-07 16:05:16 UTC
  • mfrom: (442.1.1 bug131471)
  • Revision ID: szilveszter.farkas@gmail.com-20080307160516-utllanonl1zamcqc
Merge a fix for the Conflicts dialog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
conflicts.py
100
100
                                         gtk.CellRendererText(), text=0))
101
101
            self._treeview.set_headers_visible(False)            
102
102
            self.model.append([ _("No conflicts in working tree.") ])
 
103
            self._button_diff3.set_sensitive(False)
103
104
        else:
104
105
            self.model = gtk.ListStore(gobject.TYPE_STRING,
105
106
                                       gobject.TYPE_STRING,