Y
Hacker News
new
|
ask
|
show
|
jobs
by
pabs3
920 days ago
BTW zdiff3 is a newer version of that style that is slightly better than diff3.
1 comments
juped
919 days ago
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
link