tkdiff « mergetools - git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.

Welcome to mirror list, hosted at ThFree Co, Russian Federation.

tkdiff « mergetools - git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.

summary refs log tree commit diff

path: root/mergetools/tkdiff

blob: eee5cb57e3ccf7f1ad7ad150c37a8b6d7ab6d436 (plain)

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

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
	else
		"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
	fi
}

exit_code_trustable () {
	true
}