Merge branch 'jc/checkout-from-tree-keep-local-changes'

[thirdparty/git.git] / mergetools / kompare

can_merge () {
	return 1
}

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