mergetools/kompare


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19

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
}