Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.4rc1, 0.4rc2, and 0.4rc3

merge with Steve

Changeset bb6d31bc8c5a…

Parents 0ea2ab37c9db…

Parents 8ff46ff6d00d…

by TK Soh

Changes to 2 files · Browse files at bb6d31bc8c5a Showing diff from parent 0ea2ab37c9db 8ff46ff6d00d Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​synch.py Stacked
 
18
19
20
21
 
22
23
24
 
239
240
241
242
 
243
244
245
 
18
19
20
 
21
22
23
24
 
239
240
241
 
242
243
244
245
@@ -18,7 +18,7 @@
 import os  import threading  from mercurial import hg, ui, util -from dialog import error_dialog, warning_dialog +from dialog import error_dialog, question_dialog  from hglib import HgThread  from shlib import set_tortoise_icon  import gtklib @@ -239,7 +239,7 @@
  flags = ['--clean']   msg = 'Lose all changes in your working directory?'   warning += ', requires clean checkout' - if warning_dialog(msg, warning) != gtk.RESPONSE_OK: + if question_dialog(msg, warning) != gtk.RESPONSE_YES:   return   self.write("", False)  
Change 1 of 1 Show Entire File hggtk/​thgconfig.py Stacked
 
92
93
94
95
96
 
 
 
97
98
99
 
92
93
94
 
 
95
96
97
98
99
100
@@ -92,8 +92,9 @@
  'Name associated with commits'),   ('3-way Merge Tool', 'ui.merge', [],  'Graphical merge program for resolving merge conflicts. If left' -' unspecified, the Mercurial will use the first applicable' -' tool it finds on your system or default to its internal algorithm.'), +' unspecified, Mercurial will use the first applicable tool it finds' +' on your system or use its internal merge tool that leaves conflict' +' markers in place.'),   ('Editor', 'ui.editor', [],   'The editor to use during a commit and other'   ' instances where Mercurial needs multiline input from'