mergetools/tkdiff

   1 diff_cmd () {
   2         "$merge_tool_path" "$LOCAL" "$REMOTE"
   3 }
   4
   5 diff_cmd_help () {
   6         echo "Use TkDiff (requires a graphical session)"
   7 }
   8
   9 merge_cmd () {
  10         if $base_present
  11         then
  12                 "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
  13         else
  14                 "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
  15         fi
  16 }
  17
  18 exit_code_trustable () {
  19         true
  20 }
  21
  22 merge_cmd_help () {
  23         echo "Use TkDiff (requires a graphical session)"
  24 }