1234567891011121314151617181920212223242526272829 |
- diff_cmd () {
- "$merge_tool_path" "$LOCAL" "$REMOTE"
- }
- merge_cmd () {
- if $base_present
- then
- "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
- -mergeoutput="$MERGED"
- else
- "$merge_tool_path" "$LOCAL" "$REMOTE" \
- -mergeoutput="$MERGED"
- fi
- }
- translate_merge_tool_path() {
- if type bcomp >/dev/null 2>/dev/null
- then
- echo bcomp
- else
- echo bcompare
- fi
- }
- list_tool_variants () {
- echo bc
- echo bc3
- }
|