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

   1 diff_cmd () {
   2         "$merge_tool_path" "$LOCAL" "$REMOTE"
   3 }
   4
   5 merge_cmd () {
   6         if $base_present
   7         then
   8                 "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
   9                         -mergeoutput="$MERGED"
  10         else
  11                 "$merge_tool_path" "$LOCAL" "$REMOTE" \
  12                         -mergeoutput="$MERGED"
  13         fi
  14 }
  15
  16 translate_merge_tool_path() {
  17         if type bcomp >/dev/null 2>/dev/null
  18         then
  19                 echo bcomp
  20         else
  21                 echo bcompare
  22         fi
  23 }