git.oblomov.eu Git - git/blob - mergetools/diffmerge

   1 diff_cmd () {
   2         "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
   3 }
   4
   5 merge_cmd () {
   6         if $base_present
   7         then
   8                 "$merge_tool_path" --merge --result="$MERGED" \
   9                         "$LOCAL" "$BASE" "$REMOTE"
  10         else
  11                 "$merge_tool_path" --merge \
  12                         --result="$MERGED" "$LOCAL" "$REMOTE"
  13         fi
  14 }
  15
  16 exit_code_trustable () {
  17         true
  18 }