Ask HN: What's your favorite merge tool?
Seems to be quite a few options out there, and I was wondering what the crowd favorite was. There didn't seem to be a thread on this, so it might be nice to collect everyone's opinion in one place.
(
5 comments
| 4 points
| on HN
)