Making git merge understand code structure | Hacker News Reader