From 4f207f7755b0131d4fce0d5fbc74a3b5d03be224 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 29 Oct 2024 21:12:31 +0000 Subject: Recommend zdiff3 merge.conflictStyle (#1260) --- README.md | 2 +- manual/src/get-started.md | 2 +- manual/src/merge-conflicts.md | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 17aacf6..cfa3441 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ # light = true [merge] - conflictstyle = diff3 + conflictstyle = zdiff3 ``` Delta has many features and is very customizable; please see the [user manual](https://dandavison.github.io/delta/). 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:
image
-- cgit v1.2.3