Hacker News new | ask | show | jobs
by philwelch 2382 days ago
Command-line git allows you to specify a mergetool, many of which are capable of three way merges.
1 comments
cwojno 2382 days ago
The point was convenience. I don't have to leave the IDE.
link
chiefsucker 2381 days ago
For some people Unix is the IDE.
link