diffuse 248 B

12345678910111213141516
  1. diff_cmd () {
  2. "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
  3. }
  4. merge_cmd () {
  5. if $base_present
  6. then
  7. "$merge_tool_path" \
  8. "$LOCAL" "$MERGED" "$REMOTE" \
  9. "$BASE" | cat
  10. else
  11. "$merge_tool_path" \
  12. "$LOCAL" "$MERGED" "$REMOTE" | cat
  13. fi
  14. }