diff options
| author | Elijah Newren <newren@gmail.com> | 2021-12-01 00:05:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-01 22:45:59 (GMT) |
| commit | ddfc44a898a58311392a5329687a1813d6b94779 (patch) | |
| tree | b264cec304adc063f1f186bd799bebacc03edf53 /Documentation/technical | |
| parent | 4496526f80b3e4952036550b279eff8d1babd60a (diff) | |
| download | git-ddfc44a898a58311392a5329687a1813d6b94779.zip git-ddfc44a898a58311392a5329687a1813d6b94779.tar.gz git-ddfc44a898a58311392a5329687a1813d6b94779.tar.bz2 | |
update documentation for new zdiff3 conflictStyle
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 af5f9fc..35d4541 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 |