3 ms·
Even better may be to install and use git-delta which does this amongst many other things: https://github.com/dandavison/delta https://github.com/dandavison/de
by encryptluks2 5y ago
Even better may be to install and use git-delta which does this amongst many other things:
https://github.com/dandavison/delta https://github.com/dandavison/delta
- lilyball 5y agoThe 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.
- aendruk 5y agoHow so? Its documentation on merge conflicts just reiterates setting `diff3`.