diffuse « mergetools - git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.

Welcome to mirror list, hosted at ThFree Co, Russian Federation.

diffuse « mergetools - git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.

summary refs log tree commit diff

path: root/mergetools/diffuse

blob: 02e0843f47e09a7cc6cdd2a9c70e36773ecc96af (plain)

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
}