Ask HN: What is your favourite diff/merge tools? | Dark Hacker News