Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

doc: update some visual diff docs

Changeset 8a21636b38ef…

Parent ebfb6c7e772b…

by Steve Borho

Changes to 2 files · Browse files at 8a21636b38ef Showing diff from parent ebfb6c7e772b Diff from another changeset...

Change 1 of 1 Show Entire File doc/​source/​faq.txt Stacked
 
81
82
83
84
 
85
86
87
 
81
82
83
 
84
85
86
87
@@ -81,7 +81,7 @@
    Since version 0.10, TortoiseHg should autodetect most popular visual   diff tools and make them available for selection from the - :guilabel:`Visual Diff Command` item in the settings tool. + :guilabel:`Visual Diff Tool` item in the settings tool.    *I'm a CLI user, how do I disable the shell extensions (overlay icons and context menus)?*  
Change 1 of 1 Show Entire File doc/​source/​quick.txt Stacked
 
58
59
60
61
62
63
64
 
 
 
65
66
67
 
58
59
60
 
 
 
 
61
62
63
64
65
66
@@ -58,10 +58,9 @@
   If you are not using one of our Windows installers, you will also have  to configure a visual diff tool. Type :command:`hgtk userconfig` and on -the TortoiseHg tab you will find :guilabel:`Visual Diff Command`. If -there are no options in the drop-down list, you must enable and -configure Mercurial's ExtDiff extension and then restart the userconfig -application. +the TortoiseHg tab you will find :guilabel:`Visual Diff Tool`. If +there are no options in the drop-down list, you must install a diff tool +that is supported by our mergetools.ini or configure your own tool.      Initialize the repository