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

ini: add araxis hints from FAQ, add changeset link templates

Changeset 4fda5bc90431…

Parent dee5a3638080…

by Steve Borho

Changes to one file · Browse files at 4fda5bc90431 Showing diff from parent dee5a3638080 Diff from another changeset...

Change 1 of 2 Show Entire File contrib/​win32/​mercurial.ini Stacked
 
58
59
60
 
 
 
 
61
62
63
 
146
147
148
 
 
 
 
 
 
 
 
 
 
 
 
 
 
149
150
151
 
58
59
60
61
62
63
64
65
66
67
 
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
@@ -58,6 +58,10 @@
 winmergeu.args=/e /ub /dl other /dr local $other $local $output  winmergeu.fixeol=True  winmergeu.gui=True +araxis.executable=C:\Program Files\Araxis\Araxis Merge v6.5\AraxisP4WinMrg.exe +araxis.priority=1 +araxis.args=$base $other $local $output +araxis.gui=True    ;  ; For more information about mercurial extensions, start here @@ -146,6 +150,20 @@
 ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe  ;cmd.vimdiff = gvim.exe  ;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)' +;cmd.araxis=C:\Program Files\Araxis\Araxis Merge v6.5\compare.exe +;opts.araxis=/wait + +[tortoisehg] +; These templates will typically be applied to a repository's .hg/hgrc +; file. They are included them here for reference. +; +; Template for linking BitBucket style bug report IDs (#412) +;issue.regex = #(\d+)\b +;issue.link = http://bitbucket.org/<your project and repo>/issue/{1}/ +; +; Template for linking Mercurial style bug report IDs (issue1200) +;issue.regex = \bissue\d+\b +;issue.link = http://mercurial.selenic.com/bts/    [qct]  ;See http://bitbucket.org/tortoisehg/stable/wiki/FAQ for details