Merge conflicts
Consider setting
[merge]
conflictstyle = diff3
With that setting, when a merge conflict is encountered, delta will display diffs between the ancestral commit and each of the two merge parents:
This display can be customized using merge-conflict-begin-symbol
, merge-conflict-end-symbol
, merge-conflict-ours-diff-header-style
, merge-conflict-ours-diff-header-decoration-style
, merge-conflict-theirs-diff-header-style
, merge-conflict-theirs-diff-header-decoration-style
.