[thirdparty/git.git] / mergetools / tkdiff

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

diff_cmd_help () {
	echo "Use TkDiff (requires a graphical session)"
}

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
}

merge_cmd_help () {
	echo "Use TkDiff (requires a graphical session)"
}
Commit	Line	Data
bc7a96a8 DA	1	diff_cmd () {
	2	"$merge_tool_path" "$LOCAL" "$REMOTE"
	3	}
	4
980145f7 FR	5	diff_cmd_help () {
	6	echo "Use TkDiff (requires a graphical session)"
	7	}
	8
bc7a96a8 DA	9	merge_cmd () {
	10	if $base_present
	11	then
	12	"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
	13	else
	14	"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
	15	fi
	16	}
7c10605d DA	17
	18	exit_code_trustable () {
	19	true
	20	}
980145f7 FR	21
	22	merge_cmd_help () {
	23	echo "Use TkDiff (requires a graphical session)"
	24	}