Show More
| @@ -58,6 +58,12 p4merge.gui=True | |||
|
|
58 | 58 | p4merge.priority=-8 |
|
|
59 | 59 | p4merge.diffargs=$parent $child |
|
|
60 | 60 | |
|
|
61 | p4mergeosx.executable = /Applications/p4merge.app/Contents/MacOS/p4merge | |
|
|
62 | p4mergeosx.args = $base $local $other $output | |
|
|
63 | p4mergeosx.gui = True | |
|
|
64 | p4mergeosx.priority=-8 | |
|
|
65 | p4mergeosx.diffargs=$parent $child | |
|
|
66 | ||
|
|
61 | 67 | tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output |
|
|
62 | 68 | tortoisemerge.regkey=Software\TortoiseSVN |
|
|
63 | 69 | tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN |
General Comments 0
You need to be logged in to leave comments.
Login now