2 ms·Ask HN: What is your favourite diff/merge tools?1 points by nodivbyzero 6y agoJust wondering what kind of tools/strategies/flow do you use for resolving merge conflicts?