/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: matkor
  • Date: 2007-08-23 10:17:40 UTC
  • mto: This revision was merged to the branch mainline in revision 265.
  • Revision ID: matkor@laptop-hp-20070823101740-s17kf9qa383wiuje
Code for "branch update" menuitem and toolbox. Typo fix

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)
104
103
        else:
105
104
            self.model = gtk.ListStore(gobject.TYPE_STRING,
106
105
                                       gobject.TYPE_STRING,