Mercurial > hg
comparison contrib/mergetools.hgrc @ 11308:16277f8aca1a
mergetools: add configuration for Ultra Compare (issue2226)
Initial config provided by Tim Pietzcker
| author | Steve Borho <steve@borho.org> |
|---|---|
| date | Tue, 08 Jun 2010 11:58:09 -0500 |
| parents | 7d99edddbaea |
| children | 48e549d7c6ae |
comparison
equal
deleted
inserted
replaced
| 11307:7f72031d4047 | 11308:16277f8aca1a |
|---|---|
| 99 | 99 |
| 100 diffuse.priority=-3 | 100 diffuse.priority=-3 |
| 101 diffuse.args=$local $base $other | 101 diffuse.args=$local $base $other |
| 102 diffuse.gui=True | 102 diffuse.gui=True |
| 103 diffuse.diffargs=$parent $child | 103 diffuse.diffargs=$parent $child |
| 104 | |
| 105 UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe | |
| 106 UltraCompare.args = $base $local $other -title1 base -title3 other | |
| 107 UltraCompare.priority = -2 | |
| 108 UltraCompare.gui = True | |
| 109 UltraCompare.binary = True | |
| 110 UltraCompare.checkconflicts = True | |
| 111 UltraCompare.checkchanged = True | |
| 112 UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1 |