about summary refs log tree commit diff
path: root/third_party/git/mergetools/kompare
blob: e8c0bfa678547258ff0f330ae756f3621e6aadc7 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
can_merge () {
	return 1
}

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

exit_code_trustable () {
	true
}