dandavison/delta
1
1
Fork 0
mirror of https://github.com/dandavison/delta.git synced 2024-11-27 05:44:48 +03:00
Code Issues Projects Releases Wiki Activity

Recommend zdiff3 merge.conflictStyle (#1260)

Browse Source
This commit is contained in:
Adam Johnson 2024-10-29 21:12:31 +00:00 committed by GitHub
parent 9c8f40e356
commit 4f207f7755
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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/).

2
manual/src/get-started.md
View File

@ -17,5 +17,5 @@
# light = true
[merge]
conflictstyle = diff3
conflictstyle = zdiff3
```

7
manual/src/merge-conflicts.md
View File

@ -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>