1 diff_cmd () {
2 "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
3 }
5 merge_cmd () {
6 touch "$BACKUP"
7 if $base_present
8 then
9 "$merge_tool_path" "$LOCAL" "$REMOTE" \
10 -ancestor "$BASE" -merge "$MERGED" | cat
11 else
12 "$merge_tool_path" "$LOCAL" "$REMOTE" \
13 -merge "$MERGED" | cat
14 fi
15 check_unchanged
16 }