[git] / mergetools / opendiff

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

merge_cmd () {
	touch "$BACKUP"
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-ancestor "$BASE" -merge "$MERGED" | cat
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-merge "$MERGED" | cat
	fi
	check_unchanged
}
Commit	Line	Data
bc7a96a8 DA	1	diff_cmd () {
	2	"$merge_tool_path" "$LOCAL" "$REMOTE" \| cat
	3	}
	4
	5	merge_cmd () {
	6	touch "$BACKUP"
	7	if $base_present
	8	then
	9	"$merge_tool_path" "$LOCAL" "$REMOTE" \
	10	-ancestor "$BASE" -merge "$MERGED" \| cat
	11	else
	12	"$merge_tool_path" "$LOCAL" "$REMOTE" \
	13	-merge "$MERGED" \| cat
	14	fi
	15	check_unchanged
	16	}