ContextQMD
Back to Delta

Merge conflicts

manual/src/merge-conflicts.md

0.19.2896 B
Original Source

Merge conflicts

Consider setting merge.conflictStyle to zdiff3:

gitconfig
[merge]
    conflictStyle = zdiff3

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></td></tr></table>

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.