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: update docs with ini->rc extension changes

Changeset 2f5c9b8709fd…

Parent 2c1f08586fff…

by Steve Borho

Changes to 2 files · Browse files at 2f5c9b8709fd Showing diff from parent 2c1f08586fff Diff from another changeset...

Change 1 of 2 Show Entire File doc/​source/​common.txt Stacked
 
48
49
50
51
 
52
53
54
 
155
156
157
158
 
159
160
161
 
48
49
50
 
51
52
53
54
 
155
156
157
 
158
159
160
161
@@ -48,7 +48,7 @@
   In TortoiseHg 1.0, the visual (external) diff infrastructure was  refactored. The new system uses tool descriptions in -:file:`mergetools.ini` to detect most common diff tools on your computer +:file:`mergetools.rc` to detect most common diff tools on your computer  (including KDiff3, which ships in our installer) and select the best  available tool.   @@ -155,7 +155,7 @@
   The TortoiseHg Windows installers now include TortoiseSVN's scripts for  comparing (and sometimes merging) many binary document formats. These -are configured in the site-wide :file:`mergepatterns.ini` as handlers for +are configured in the site-wide :file:`mergepatterns.rc` as handlers for  each binary format's common file extensions, so no user intervention is  required.  
Change 1 of 1 Show Entire File doc/​source/​intro.txt Stacked
 
130
131
132
133
 
134
135
136
 
130
131
132
 
133
134
135
136
@@ -130,7 +130,7 @@
   .. note::   If you install TortoiseHg from source, you need to add our - contrib/mergetools.ini file to your HGRC path in some way. One + contrib/mergetools.rc file to your HGRC path in some way. One   approach is to %include it from your ~/.hgrc file.    Language settings