Show More
@@ -71,6 +71,12 b' ecmerge.regkeyalt=Software\\Wow6432Node\\E' | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now