/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: Adeodato Simó
  • Date: 2007-07-31 17:13:40 UTC
  • mto: This revision was merged to the branch mainline in revision 254.
  • Revision ID: dato@net.com.org.es-20070731171340-35ykvlg7jgesfzoq
Fix gconflicts docstring.

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. 
379
379
 
380
380
 
381
381
class cmd_gconflicts(GTKCommand):
382
 
    """ GTK+ push.
 
382
    """ GTK+ conflicts.
383
383
    
 
384
    Select files from the list of conflicts and run an external utility to
 
385
    resolve them.
384
386
    """
385
387
    def run(self):
386
388
        (wt, path) = workingtree.WorkingTree.open_containing('.')