https://github.com/git/git
Raw File
Tip revision: cd3e606211bb1cf8bc57f7d76bab98cc17a150bc authored by Junio C Hamano on 15 November 2021, 06:50:52 UTC
Git 2.34
Tip revision: cd3e606
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
}
back to top