mergetools/kdiff3

   1 diff_cmd () {
   2         "$merge_tool_path" \
   3                 --L1 "$MERGED (A)" --L2 "$MERGED (B)" \
   4                 "$LOCAL" "$REMOTE" >/dev/null 2>&1
   5 }
   6
   7 diff_cmd_help () {
   8         echo "Use KDiff3 (requires a graphical session)"
   9 }
  10
  11 merge_cmd () {
  12         if $base_present
  13         then
  14                 "$merge_tool_path" --auto \
  15                         --L1 "$MERGED (Base)" \
  16                         --L2 "$MERGED (Local)" \
  17                         --L3 "$MERGED (Remote)" \
  18                         -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \
  19                 >/dev/null 2>&1
  20         else
  21                 "$merge_tool_path" --auto \
  22                         --L1 "$MERGED (Local)" \
  23                         --L2 "$MERGED (Remote)" \
  24                         -o "$MERGED" "$LOCAL" "$REMOTE" \
  25                 >/dev/null 2>&1
  26         fi
  27 }
  28
  29 merge_cmd_help () {
  30         echo "Use KDiff3 (requires a graphical session)"
  31 }
  32
  33 exit_code_trustable () {
  34         true
  35 }
  36
  37 translate_merge_tool_path() {
  38         if type kdiff3 >/dev/null 2>/dev/null
  39         then
  40                 echo kdiff3
  41         else
  42                 mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3"
  43         fi
  44 }