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

thgconfig: add support for newly introduced merge tool options

Changeset 5f5f0165cdad…

Parent e214839bf369…

by Steve Borho

Changes to one file · Browse files at 5f5f0165cdad Showing diff from parent e214839bf369 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​thgconfig.py Stacked
 
28
29
30
31
 
 
 
32
33
34
 
849
850
851
 
 
852
853
854
 
28
29
30
 
31
32
33
34
35
36
 
851
852
853
854
855
856
857
858
@@ -28,7 +28,9 @@
  _('Graphical merge program for resolving merge conflicts. If left'   ' 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. Chose internal:merge to force conflict markers.')), + ' markers in place. Chose internal:merge to force conflict markers,' + ' internal:prompt to always select local or other, or internal:dump' + ' to leave files in the working directory for manual merging')),   (_('Visual Diff Command'), 'tortoisehg.vdiff', [],   _('Specify visual diff tool; must be an extdiff command')),   (_('Skip Diff Window'), 'tortoisehg.vdiffnowin', ['False', 'True'], @@ -849,6 +851,8 @@
  if filemerge._findtool(self.ui, t):   values.append(t)   values.append('internal:merge') + values.append('internal:prompt') + values.append('internal:dump')   except ImportError:   pass