[EDIT] FILE: kompare

can_merge () { return 1 } diff_cmd_help () { echo "Use Kompare (requires a graphical session)" } diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } merge_cmd_help () { echo "Use Kompare (requires a graphical session)" } exit_code_trustable () { true }
SAVE CANCEL