Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.2, 0.8.3, and 0.9

stable merge: fix --rev command line argument

The description was wrong, and we should default to None if none is given.

Changeset ab212f172fb0…

Parent 2c31dd2ec419…

by Steve Borho

Changes to one file · Browse files at ab212f172fb0 Showing diff from parent 2c31dd2ec419 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​hgtk.py Stacked
 
658
659
660
661
 
662
663
664
 
658
659
660
 
661
662
663
664
@@ -658,7 +658,7 @@
  [('l', 'limit', '', _('limit number of changes displayed'))],   _('hgtk log [OPTIONS] [FILE]')),   "^merge": (merge, - [('r', 'rev', '', _('revision to update'))], + [('r', 'rev', None, _('revision to merge with'))],   _('hgtk merge')),   "^recovery|rollback|verify": (recovery, [], _('hgtk recovery')),   "^shelve|unshelve": (shelve, [], _('hgtk shelve')),