Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: df3c41adeb212432c53d93ce6ace5d5374dc6e11 authored by Junio C Hamano on 14 January 2022, 23:26:53 UTC
Git 2.35-rc1
Tip revision: df3c41a
diffmerge
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" --merge --result="$MERGED" \
			"$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" --merge \
			--result="$MERGED" "$LOCAL" "$REMOTE"
	fi
}

exit_code_trustable () {
	true
}
back to top