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

stable doc: add notes about mergetools.ini

Changeset 8d0577678651…

Parent f36d0b674ebe…

by Steve Borho

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

Change 1 of 1 Show Entire File doc/​source/​intro.txt Stacked
 
128
129
130
 
 
 
 
 
131
132
133
 
128
129
130
131
132
133
134
135
136
137
138
@@ -128,6 +128,11 @@
 dialogs via the source install method. For details, see  `Mac OS X <http://bitbucket.org/tortoisehg/stable/wiki/MacOSX>`_.   +.. note:: + If you install TortoiseHg from source, you need to add our + contrib/mergetools.ini file to your HGRC path in some way. One + approach is to %include it from your ~/.hgrc file. +  Language settings  ^^^^^^^^^^^^^^^^^  
Change 1 of 1 Show Entire File doc/​source/​quick.txt Stacked
 
74
75
76
 
 
 
 
 
77
78
79
 
74
75
76
77
78
79
80
81
82
83
84
@@ -74,6 +74,11 @@
 diff/merge tool that is supported by our mergetools.rc or configure your  own tool.   +.. note:: + If you installed TortoiseHg from source, you need to add our + contrib/mergetools.ini file to your HGRC path in some way. One + approach is to %include it from your ~/.hgrc file. +  Feel free to configure other global settings while you have the dialog  open. You will have the chance later to override these global settings  with repository local settings, if required.