Content - 433686c12a088195bbf21b2e409c21df199ba988 - 48b0035/mergetools/kompare

visit type:

Tip revision: 27ea6f85beff1173ec74349fa35c45951feee570 authored by Junio C Hamano on 04 September 2015, 17:46:00 UTC
Git 2.5.2

Tip revision: 27ea6f8

kompare

can_merge () {
	return 1
}

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