Difference between CVS and Git merging (diagram) | Hacker News Reader