Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9.1, 0.9.1.1, and 0.9.2

stable doc: update FAQ on use of Araxis Merge

Changeset 611f072ed5a0…

Parent 2db0a470f64f…

by Steve Borho

Changes to one file · Browse files at 611f072ed5a0 Showing diff from parent 2db0a470f64f Diff from another changeset...

Change 1 of 1 Show Entire File doc/​source/​faq.txt Stacked
 
88
89
90
91
 
92
93
94
95
96
97
 
 
 
 
 
 
 
 
 
 
98
99
100
101
102
 
 
 
 
103
104
105
 
88
89
90
 
91
92
93
94
95
 
 
96
97
98
99
100
101
102
103
104
105
106
107
 
 
 
108
109
110
111
112
113
114
@@ -88,18 +88,27 @@
  diffs if it is to be used by TortoiseHg, unless you are using   release 0.8 or later.   -*How can I use Araxis Merge as my visual diff tool?* +*How can I use Araxis Merge as my visual diff and merge tool?*     Add these lines to your personal :file:`Mercurial.ini` file ::     [extdiff] - cmd.adiff=C:\Program Files\Araxis\Araxis Merge v6.5\compare.exe - opts.adiff=/wait + cmd.araxis=C:\Program Files\Araxis\Araxis Merge\compare.exe + opts.araxis=/wait + + [merge-tools] + araxis.executable=C:\Program Files\Araxis\Araxis Merge\AraxisP4WinMrg.exe + araxis.priority=1 + araxis.args=$base $other $local $output + araxis.gui=True + + If you're on a 64 bit OS, append (x86) to Program Files.     Now run the :guilabel:`Global Settings` tool. On the - :guilabel:`TortoiseHg` tab, you should see :guilabel:`adiff` - available in the drop-down list for :guilabel:`Visual Diff Command`. - Select :guilabel:`adiff`, apply, then close. + :guilabel:`TortoiseHg` tab, you should see :guilabel:`araxis` + available in the drop-down list for :guilabel:`Three-way Merge Tool` + and :guilabel:`Visual Diff Command`. Select :guilabel:`araxis` for + both, then close.    *I'm a CLI user, how do I disable the shell extensions (overlay icons and context menus)?*