[thirdparty/git.git] / mergetools / opendiff

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

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

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-ancestor "$BASE" -merge "$MERGED" | cat
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-merge "$MERGED" | cat
	fi
}

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