/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: Jelmer Vernooij
  • Date: 2007-08-02 17:39:34 UTC
  • mfrom: (242.1.2 bzr-gtk)
  • Revision ID: jelmer@samba.org-20070802173934-618dijbujohkcp9q
Merge gconflicts fixes from dato.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
20
20
gbranch           GTK+ branching. 
21
21
gcheckout         GTK+ checkout. 
22
22
gcommit           GTK+ commit dialog 
23
 
gconflicts        GTK+ push. 
 
23
gconflicts        GTK+ conflicts. 
24
24
gdiff             Show differences in working tree in a GTK+ Window. 
25
25
ginit             Initialise a new branch.
26
26
gmissing          GTK+ missing revisions dialog. 
384
384
 
385
385
 
386
386
class cmd_gconflicts(GTKCommand):
387
 
    """ GTK+ push.
 
387
    """ GTK+ conflicts.
388
388
    
 
389
    Select files from the list of conflicts and run an external utility to
 
390
    resolve them.
389
391
    """
390
392
    def run(self):
391
393
        (wt, path) = workingtree.WorkingTree.open_containing('.')