diff options
| author | Adam Johnson <me@adamj.eu> | 2024-10-29 21:12:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-29 17:12:31 -0400 |
| commit | 4f207f7755b0131d4fce0d5fbc74a3b5d03be224 (patch) | |
| tree | 5f4dd391a1bb89ee6516566e48f26b053f291bc7 /manual | |
| parent | 9c8f40e3562be6d8a32d54594028d4e2cbba8e4c (diff) | |
Recommend zdiff3 merge.conflictStyle (#1260)
Diffstat (limited to 'manual')
| -rw-r--r-- | manual/src/get-started.md | 2 | ||||
| -rw-r--r-- | manual/src/merge-conflicts.md | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/manual/src/get-started.md b/manual/src/get-started.md index 2153b0d..50d07de 100644 --- a/manual/src/get-started.md +++ b/manual/src/get-started.md @@ -17,5 +17,5 @@ # light = true [merge] - conflictstyle = diff3 + conflictstyle = zdiff3 ``` diff --git a/manual/src/merge-conflicts.md b/manual/src/merge-conflicts.md index a6c3056..e593cdd 100644 --- a/manual/src/merge-conflicts.md +++ b/manual/src/merge-conflicts.md @@ -1,13 +1,14 @@ # Merge conflicts -Consider setting +Consider setting [`merge.conflictStyle`](https://git-scm.com/docs/git-config#Documentation/git-config.txt-mergeconflictStyle) to `zdiff3`: ```gitconfig [merge] - conflictstyle = diff3 + conflictStyle = zdiff3 ``` -With that setting, when a merge conflict is encountered, delta will display diffs between the ancestral commit and each of the two merge parents: +With that setting, when a merge conflict is encountered, Git will display merge conflicts with the contents of the merge base as well. +delta will then display this as two diffs, from the ancestor to each side of the conflict: <table><tr><td><img width=500px src="https://user-images.githubusercontent.com/52205/144783121-bb549100-69d8-41b8-ac62-1704f1f7b43e.png" alt="image" /></td></tr></table> |