comparison hgrc/hgrc-Windows_NT @ 97:e6ecdb8ef62f

Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 29 Mar 2012 21:53:12 -0700
parents 4a7d5630410a
children 300b70bbfc67
comparison
equal deleted inserted replaced
96:4c2c0fadab01 97:e6ecdb8ef62f
1 [ui] 1 [ui]
2 ssh = "TortoisePlink.exe" -ssh -2 -batch -C 2 ssh = "TortoisePlink.exe" -ssh -2 -batch -C
3
4 [extensions]
5 hggit = ${userprofile}\Code\BitBucket\HgGit\hggit
6 3
7 [extdiff] 4 [extdiff]
8 cmds.wdiff = "C:\Program Files (x86)\WinMerge\WinMergeU.exe" 5 cmds.wdiff = "C:\Program Files (x86)\WinMerge\WinMergeU.exe"
9 6
10 [tortoisehg] 7 [tortoisehg]