Hacker News new | ask | show | jobs
by cma 2633 days ago
If you want to see what changed between two versions you are merging (both without your changes), your currently in progress merge, and your current version before you started merging.