Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable repowidget: Change "Merge with..." into "Merge with local..."

Changeset f382e9ac2ed1…

Parent 4bff4f6eeb51…

by Angel Ezquerra

Changes to one file · Browse files at f382e9ac2ed1 Showing diff from parent 4bff4f6eeb51 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
902
903
904
905
 
906
907
908
 
902
903
904
 
905
906
907
908
@@ -902,7 +902,7 @@
  entry(menu, None, isctx, _('Browse at rev...'), 'hg-annotate',   self.manifestRevision)   entry(menu) - entry(menu, None, fixed, _('Merge with...'), 'hg-merge', + entry(menu, None, fixed, _('Merge with local...'), 'hg-merge',   self.mergeWithRevision)   entry(menu)   entry(menu, None, fixed, _('Tag...'), 'hg-tag',