Ask HN: What is your favourite diff/merge tools?

[nodivbyzero]

Just wondering what kind of tools/strategies/flow do you use for resolving merge conflicts?