Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 6de6196eaa83

Parents 664dd9f82d04

Parents 856069dd10c7

by Steve Borho

Changes to one file · Browse files at 6de6196eaa83 Showing diff from parent 664dd9f82d04 856069dd10c7 Diff from another changeset...

 
267
268
269
 
270
271
272
 
267
268
269
270
271
272
273
@@ -267,6 +267,7 @@
  ui.config('ui', 'editor') or   os.environ.get('EDITOR', 'vi'))   if os.path.basename(editor) in ('vi', 'vim', 'hgeditor'): + from tortoisehg.hgtk import gdialog   gdialog.Prompt(_('No visual editor configured'),   _('Please configure a visual editor.'), parent).run()   return False