12345678910111213141516171819 |
- diff_cmd () {
- "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
- }
- merge_cmd () {
- if $base_present
- then
- "$merge_tool_path" -wait -merge -3 -a1 \
- "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
- else
- "$merge_tool_path" -wait -2 \
- "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
- fi
- }
- translate_merge_tool_path() {
- echo compare
- }
|