Re: [PATCH v2 2/9] mergetools: vimdiff: shuffle single window case

From: Fernando Ramos <greenfoo@u92.eu>
Date: Aug 7, 2022, 14:46 UTC
Message-ID: <Yu/QQe4lz2MhiCQp@zacax395.localdomain>
In-Reply-To: <20220807024941.222018-3-felipe.contreras@gmail.com>

On 22/08/06 09:49PM, Felipe Contreras wrote:

Show 9 quoted lines

>
> +	# A single window is handled specially
> +
> +	if ! echo "$LAYOUT" | grep ",\|/" >/dev/null
> +	then
> +		CMD=$(gen_cmd_aux "$LAYOUT")
> +		FINAL_CMD="-c \"$CMD | bufdo diffthis\" -c \"tabfirst\""
> +		return
> +	fi

If you make this change, it fixes the first issue I was referring to in [1]

-       if ! echo "$LAYOUT" | grep ",\|/" >/dev/null
+       if ! echo "$LAYOUT" | grep ",\|/\|\+" >/dev/null

[1] https://lore.kernel.org/git/Yu9vvAKJzOpoQ5AS@zacax395.localdomain/

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.