Show More
| @@ -46,5 +46,6 b' ecmerge.args=$base $local $other --mode=' | |||
|
|
46 | 46 | ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge |
|
|
47 | 47 | ecmerge.gui=True |
|
|
48 | 48 | |
|
|
49 | filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge | |
|
|
49 | 50 | filemerge.args=-left $other -right $local -ancestor $base -merge $output |
|
|
50 | 51 | filemerge.gui=True |
General Comments 0
You need to be logged in to leave comments.
Login now