3 ms·
The parent comment is about merge style, not diff style. Delta displays diffs, it's not a merge tool.
by lilyball 5y ago
The parent comment is about merge style, not diff style. Delta displays diffs, it's not a merge tool.
- encryptluks2 5y agoIt is also a tool to resolve merges as well.
- lilyball 5y agoIt can display merge conflicts (as Git can display those) but it doesn't resolve them. It's purely a display tool. Its installation instructions recommend setting `merge.conflictstyle = diff3` but that's not an automatic process.