1 diff_cmd () {
2 "$merge_tool_path" "$LOCAL" "$REMOTE"
3 }
5 merge_cmd () {
6 if test -z "${meld_has_output_option:+set}"
7 then
8 check_meld_for_output_version
9 fi
10 touch "$BACKUP"
11 if test "$meld_has_output_option" = true
12 then
13 "$merge_tool_path" --output "$MERGED" \
14 "$LOCAL" "$BASE" "$REMOTE"
15 else
16 "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
17 fi
18 check_unchanged
19 }
21 # Check whether 'meld --output <file>' is supported
22 check_meld_for_output_version () {
23 meld_path="$(git config mergetool.meld.path)"
24 meld_path="${meld_path:-meld}"
26 if "$meld_path" --output /dev/null --help >/dev/null 2>&1
27 then
28 meld_has_output_option=true
29 else
30 meld_has_output_option=false
31 fi
32 }