16 lines
361 B
Text
16 lines
361 B
Text
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
|
||
|
|
return 0
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
# mergetool.winmerge.trustExitCode is implicitly false.
|
||
|
|
# touch $BACKUP so that we can check_unchanged.
|
||
|
|
"$merge_tool_path" -u -e -dl Local -dr Remote \
|
||
|
|
"$LOCAL" "$REMOTE" "$MERGED"
|
||
|
|
}
|
||
|
|
|
||
|
|
translate_merge_tool_path() {
|
||
|
|
mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
|
||
|
|
}
|