Hacker News new | ask | show | jobs
by billconan 1675 days ago
so how do I do diff and merge (resolve conflicts)?