Raw
1 can_merge () {
2 return 1
3 }
4
5 diff_cmd_help () {
6 echo "Use Kompare (requires a graphical session)"
7 }
8
9 diff_cmd () {
10 "$merge_tool_path" "$LOCAL" "$REMOTE"
11 }
12
13 merge_cmd_help () {
14 echo "Use Kompare (requires a graphical session)"
15 }
16
17 exit_code_trustable () {
18 true
19 }