[git] / mergetools / kompare

can_merge () {
	return 1
}

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}
Commit	Line	Data
bc7a96a8 DA	1	can_merge () {
	2	return 1
	3	}
	4
	5	diff_cmd () {
	6	"$merge_tool_path" "$LOCAL" "$REMOTE"
	7	}