kdiff3 522 B

12345678910111213141516171819202122232425262728
  1. diff_cmd () {
  2. "$merge_tool_path" \
  3. --L1 "$MERGED (A)" --L2 "$MERGED (B)" \
  4. "$LOCAL" "$REMOTE" >/dev/null 2>&1
  5. }
  6. merge_cmd () {
  7. if $base_present
  8. then
  9. "$merge_tool_path" --auto \
  10. --L1 "$MERGED (Base)" \
  11. --L2 "$MERGED (Local)" \
  12. --L3 "$MERGED (Remote)" \
  13. -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \
  14. >/dev/null 2>&1
  15. else
  16. "$merge_tool_path" --auto \
  17. --L1 "$MERGED (Local)" \
  18. --L2 "$MERGED (Remote)" \
  19. -o "$MERGED" "$LOCAL" "$REMOTE" \
  20. >/dev/null 2>&1
  21. fi
  22. }
  23. exit_code_trustable () {
  24. true
  25. }