Hacker News
new
|
past
|
comments
|
ask
|
show
|
jobs
|
submit
login
encryptluks2
on April 18, 2022
|
parent
|
context
|
favorite
| on:
Highlights from Git 2.36
Even better may be to install and use git-delta which does this amongst many other things:
https://github.com/dandavison/delta
lilyball
on April 18, 2022
|
next
[–]
The parent comment is about merge style, not diff style. Delta displays diffs, it's not a merge tool.
encryptluks2
on April 18, 2022
|
parent
|
next
[–]
It is also a tool to resolve merges as well.
lilyball
on April 19, 2022
|
root
|
parent
|
next
[–]
It 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
on April 18, 2022
|
prev
[–]
How so? Its documentation on merge conflicts just reiterates setting `diff3`.
Guidelines
|
FAQ
|
Lists
|
API
|
Security
|
Legal
|
Apply to YC
|
Contact
Search:
https://github.com/dandavison/delta