← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to www/apps/browser/__init__.py

  • Committer: wagrant
  • Date: 2008-07-21 04:56:00 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:919
fileservice_lib: Implement "svn resolved".
browser: Expose SVN resolution marking in the UI.

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/apps/browser/__init__.py
178
178
        ('svnrevert',   ['Revert',       'Restore the selected files back to their last committed state']),
179
179
        ('svnupdate',   ['Update',       'Update your files with changes from the permanent repository']),
180
180
        ('svncommit',   ['Commit',       'Commit any changes to the permanent repository']),
 
181
        ('svnresolved', ['Mark Resolved','Mark a conflicted file as being resolved']),
181
182
        ('svnlog',      ['View Log',     'View the log of commits of the selected file']),
182
183
        ('svncheckout', ['Re-checkout',  'Re-checkout your default directories'])
183
184
      ])