Recommend zdiff3 merge.conflictStyle

dandavison · Dec 14, 2022 · aabfcfe · aabfcfe
1 parent 5cef387
commit aabfcfe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@
     light = false      # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
 
 [merge]
-    conflictstyle = diff3
+    conflictStyle = zdiff3
 
 [diff]
     colorMoved = default

diff --git a/manual/src/get-started.md b/manual/src/get-started.md
@@ -13,7 +13,7 @@
     navigate = true
 
 [merge]
-    conflictstyle = diff3
+    conflictStyle = zdiff3
 
 [diff]
     colorMoved = default

diff --git 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>