diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:47 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:47 -0800 |
commit | 4ce498baa3976cf96d3feb4215a486dd47ec2e7b (patch) | |
tree | 6461c3669e41cebaf33f124d5964c06072803187 /Documentation/technical | |
parent | 62329d336f5d427d8f08035798bf62cd7d8fd847 (diff) | |
parent | ddfc44a898a58311392a5329687a1813d6b94779 (diff) | |
download | git-4ce498baa3976cf96d3feb4215a486dd47ec2e7b.tar.gz |
Merge branch 'en/zdiff3'
"Zealous diff3" style of merge conflict presentation has been added.
* en/zdiff3:
update documentation for new zdiff3 conflictStyle
xdiff: implement a zealous diff3, or "zdiff3"
Diffstat (limited to 'Documentation/technical')
-rw-r--r-- | Documentation/technical/rerere.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.txt index af5f9fc24f..35d4541433 100644 --- a/Documentation/technical/rerere.txt +++ b/Documentation/technical/rerere.txt @@ -14,9 +14,9 @@ conflicts before writing them to the rerere database. Different conflict styles and branch names are normalized by stripping the labels from the conflict markers, and removing the common ancestor -version from the `diff3` conflict style. Branches that are merged -in different order are normalized by sorting the conflict hunks. More -on each of those steps in the following sections. +version from the `diff3` or `zdiff3` conflict styles. Branches that +are merged in different order are normalized by sorting the conflict +hunks. More on each of those steps in the following sections. Once these two normalization operations are applied, a conflict ID is calculated based on the normalized conflict, which is later used by @@ -42,8 +42,8 @@ get a conflict like the following: >>>>>>> AC Doing the analogous with AC2 (forking a branch ABAC2 off of branch AB -and then merging branch AC2 into it), using the diff3 conflict style, -we get a conflict like the following: +and then merging branch AC2 into it), using the diff3 or zdiff3 +conflict style, we get a conflict like the following: <<<<<<< HEAD B |