equal
deleted
inserted
replaced
69 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge |
69 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge |
70 ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge |
70 ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge |
71 ecmerge.gui=True |
71 ecmerge.gui=True |
72 ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel' |
72 ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel' |
73 |
73 |
|
74 # editmerge is a small script shipped in contrib. |
|
75 # It needs this config otherwise it behaves the same as internal:local |
|
76 editmerge.args=$output |
|
77 editmerge.check=changed |
|
78 editmerge.premerge=keep |
|
79 |
74 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge |
80 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge |
75 filemerge.args=-left $other -right $local -ancestor $base -merge $output |
81 filemerge.args=-left $other -right $local -ancestor $base -merge $output |
76 filemerge.gui=True |
82 filemerge.gui=True |
77 |
83 |
78 ; Windows version of Beyond Compare |
84 ; Windows version of Beyond Compare |