guiffy « 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.

guiffy « 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/guiffy

blob: 8b23a13c4111bdecc700a4a1a4547e15760eba58 (plain)

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

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -s "$LOCAL" \
		"$REMOTE" "$BASE" "$MERGED"
	else
		"$merge_tool_path" -m "$LOCAL" \
		"$REMOTE" "$MERGED"
	fi
}

exit_code_trustable () {
	true
}