[PATCH 0/2] RFC: implement new zdiff3 conflict style · Elijah Newren via GitGitGadget <hidden> · 2021-06-15
[PATCH 1/2] xdiff: implement a zealous diff3, or "zdiff3" · Elijah Newren via GitGitGadget <hidden> · 2021-06-15
RE: [PATCH 1/2] xdiff: implement a zealous diff3, or "zdiff3" · Felipe Contreras <hidden> · 2021-06-15
Re: [PATCH 1/2] xdiff: implement a zealous diff3, or "zdiff3" · Elijah Newren <hidden> · 2021-06-15
[PATCH 2/2] update documentation for new zdiff3 conflictStyle · Elijah Newren via GitGitGadget <hidden> · 2021-06-15
Re: [PATCH 0/2] RFC: implement new zdiff3 conflict style · Jeff King <hidden> · 2021-06-15
Re: [PATCH 0/2] RFC: implement new zdiff3 conflict style · Elijah Newren <hidden> · 2021-06-15
Re: [PATCH 0/2] RFC: implement new zdiff3 conflict style · Phillip Wood <hidden> · 2021-06-16
Re: [PATCH 0/2] RFC: implement new zdiff3 conflict style · Jeff King <hidden> · 2021-06-16
Re: [PATCH 0/2] RFC: implement new zdiff3 conflict style · Phillip Wood <hidden> · 2021-06-23
Re: [PATCH 0/2] RFC: implement new zdiff3 conflict style · Jeff King <hidden> · 2021-06-23
Re: [PATCH 0/2] RFC: implement new zdiff3 conflict style · Elijah Newren <hidden> · 2021-06-17
Re: [PATCH 0/2] RFC: implement new zdiff3 conflict style · Johannes Sixt <hidden> · 2021-06-15
Re: [PATCH 0/2] RFC: implement new zdiff3 conflict style · Elijah Newren <hidden> · 2021-06-15
Re: [PATCH 0/2] RFC: implement new zdiff3 conflict style · Johannes Sixt <hidden> · 2021-06-16
Re: [PATCH 0/2] RFC: implement new zdiff3 conflict style · Elijah Newren <hidden> · 2021-06-16
[PATCH v2 0/2] RFC: implement new zdiff3 conflict style · Elijah Newren via GitGitGadget <hidden> · 2021-09-11
[PATCH v2 1/2] xdiff: implement a zealous diff3, or "zdiff3" · Elijah Newren via GitGitGadget <hidden> · 2021-09-11
Re: [PATCH v2 1/2] xdiff: implement a zealous diff3, or "zdiff3" · Phillip Wood <hidden> · 2021-09-15
Re: [PATCH v2 1/2] xdiff: implement a zealous diff3, or "zdiff3" · Phillip Wood <hidden> · 2021-09-15
Re: [PATCH v2 1/2] xdiff: implement a zealous diff3, or "zdiff3" · Elijah Newren <hidden> · 2021-09-18
Re: [PATCH v2 1/2] xdiff: implement a zealous diff3, or "zdiff3" · Phillip Wood <hidden> · 2021-09-24
Re: [PATCH v2 1/2] xdiff: implement a zealous diff3, or "zdiff3" · Elijah Newren <hidden> · 2021-09-18
Re: [PATCH v2 1/2] xdiff: implement a zealous diff3, or "zdiff3" · Phillip Wood <hidden> · 2021-09-24
[PATCH v2 2/2] update documentation for new zdiff3 conflictStyle · Elijah Newren via GitGitGadget <hidden> · 2021-09-11
[PATCH v3 0/2] RFC: implement new zdiff3 conflict style · Elijah Newren via GitGitGadget <hidden> · 2021-09-18
[PATCH v3 1/2] xdiff: implement a zealous diff3, or "zdiff3" · Elijah Newren via GitGitGadget <hidden> · 2021-09-18
[PATCH v3 2/2] update documentation for new zdiff3 conflictStyle · Elijah Newren via GitGitGadget <hidden> · 2021-09-18
[PATCH v4 0/2] Implement new zdiff3 conflict style · Elijah Newren via GitGitGadget <hidden> · 2021-11-16
[PATCH v4 1/2] xdiff: implement a zealous diff3, or "zdiff3" · Phillip Wood via GitGitGadget <hidden> · 2021-11-16
[PATCH v4 2/2] update documentation for new zdiff3 conflictStyle · Elijah Newren via GitGitGadget <hidden> · 2021-11-16
[PATCH v5 0/2] Implement new zdiff3 conflict style · Elijah Newren via GitGitGadget <hidden> · 2021-12-01
[PATCH v5 1/2] xdiff: implement a zealous diff3, or "zdiff3" · Phillip Wood via GitGitGadget <hidden> · 2021-12-01
[PATCH v5 2/2] update documentation for new zdiff3 conflictStyle · Elijah Newren via GitGitGadget <hidden> · 2021-12-01
Re: [PATCH v5 2/2] update documentation for new zdiff3 conflictStyle · Bagas Sanjaya <hidden> · 2021-12-02
Re: [PATCH v5 2/2] update documentation for new zdiff3 conflictStyle · Eric Sunshine <hidden> · 2021-12-02

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

From: Bagas Sanjaya <hidden>
Date: 2021-12-02 08:42:49

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

  	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

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help