[thirdparty/git.git] / mergetools / diffuse

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

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