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

Merge with stable

Changeset a5135af9c4b2…

Parents 8d6cf1472818…

Parents 682c00ad38e2…

by Steve Borho

Changes to 2 files · Browse files at a5135af9c4b2 Showing diff from parent 8d6cf1472818 682c00ad38e2 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)?*  
Change 1 of 2 Show Entire File tortoisehg/​util/​hgversion.py Stacked
 
5
6
7
 
 
8
9
10
 
23
24
25
26
 
27
28
29
 
5
6
7
8
9
10
11
12
 
25
26
27
 
28
29
30
31
@@ -5,6 +5,8 @@
 # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.   +import re +  try:   # post 1.1.2   from mercurial import util @@ -23,7 +25,7 @@
  if not v or v == 'unknown' or len(v) >= 12:   # can't make any intelligent decisions about unknown or hashes   return - vers = v.split('.')[:2] + vers = re.split(r'\.|-', v)[:2]   if vers == reqver or len(vers) < 2:   return   nextver = list(reqver)