[thirdparty/git.git] / mergetools / kompare

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
}
Commit	Line	Data
bc7a96a8 DA	1	can_merge () {
	2	return 1
	3	}
	4
980145f7 FR	5	diff_cmd_help () {
	6	echo "Use Kompare (requires a graphical session)"
	7	}
	8
bc7a96a8 DA	9	diff_cmd () {
	10	"$merge_tool_path" "$LOCAL" "$REMOTE"
	11	}
7c10605d	12
980145f7 FR	13	merge_cmd_help () {
	14	echo "Use Kompare (requires a graphical session)"
	15	}
	16
7c10605d DA	17	exit_code_trustable () {
	18	true
	19	}