araxis 358 B

12345678910111213141516171819
  1. diff_cmd () {
  2. "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
  3. }
  4. merge_cmd () {
  5. if $base_present
  6. then
  7. "$merge_tool_path" -wait -merge -3 -a1 \
  8. "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
  9. else
  10. "$merge_tool_path" -wait -2 \
  11. "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
  12. fi
  13. }
  14. translate_merge_tool_path() {
  15. echo compare
  16. }