DeltaWalker config file for git diff and merge

deltawalker

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" "$MERGED" >/dev/null 2>&1
		status=$?
	else
		status=1
	fi
}