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

hggtk/thgconfig: improve description of ui.merge

Changeset 893b9d91abb9…

Parent 7b4a50b6ee40…

by Steve Borho

Changes to one file · Browse files at 893b9d91abb9 Showing diff from parent 7b4a50b6ee40 Diff from another changeset...

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'