Hacker News
new
|
past
|
comments
|
ask
|
show
|
jobs
|
submit
login
pabs3
on Dec 14, 2023
|
parent
|
context
|
favorite
| on:
The state of merging technology
BTW zdiff3 is a newer version of that style that is slightly better than diff3.
juped
on Dec 14, 2023
[–]
zdiff3 is NOT "better", it's a matter of personal preference. it moves common lines out of the conflicted hunks, which may be highly confusing. some people use it anyway
Guidelines
|
FAQ
|
Lists
|
API
|
Security
|
Legal
|
Apply to YC
|
Contact
Search:
