[thirdparty/git.git] / mergetools / diffuse

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

merge_cmd () {
	touch "$BACKUP"
	if $base_present
	then
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" \
			"$BASE" | cat
	else
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" | 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" \
	10	"$LOCAL" "$MERGED" "$REMOTE" \
	11	"$BASE" \| cat
	12	else
	13	"$merge_tool_path" \
	14	"$LOCAL" "$MERGED" "$REMOTE" \| cat
	15	fi
	16	check_unchanged
	17	}