Re: [PATCH v5 2/2] update documentation for new zdiff3 conflictStyle

From: Bagas Sanjaya <bagasdotme@gmail.com>
Date: Dec 2, 2021, 08:42 UTC
Message-ID: <df70e408-9355-aff7-c6fe-540b5c687865@gmail.com>
In-Reply-To: <409ae2bbd85c20a88347a4e1b8afdddcb7c82e5d.1638317108.git.gitgitgadget@gmail.com>

On 01/12/21 07.05, Elijah Newren via GitGitGadget wrote:

Show 7 quoted lines

>   	The same as `--merge` option above, but changes the way the
>   	conflicting hunks are presented, overriding the
>   	`merge.conflictStyle` configuration variable.  Possible values are
> -	"merge" (default) and "diff3" (in addition to what is shown by
> -	"merge" style, shows the original contents).
> +	"merge" (default), "diff3", and "zdiff3".
>

Missing '... (the latter both also shows the original contents)'.

-- 
An old man doll... just what I always wanted! - Clara

$ 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.