Move struct line to view header and fix includes
Add missing return value to the doc-gen tool's main method
Parse git's combined diff format so edit works for unmerged files