mergetools/araxis

   1 diff_cmd () {
   2         "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
   3 }
   4
   5 diff_cmd_help () {
   6         echo "Use Araxis Merge (requires a graphical session)"
   7 }
   8
   9 merge_cmd () {
  10         if $base_present
  11         then
  12                 "$merge_tool_path" -wait -merge -3 -a1 \
  13                         "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
  14         else
  15                 "$merge_tool_path" -wait -2 \
  16                         "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
  17         fi
  18 }
  19
  20 merge_cmd_help () {
  21         echo "Use Araxis Merge (requires a graphical session)"
  22 }
  23
  24 translate_merge_tool_path() {
  25         echo compare
  26 }