This change modifies the actions and mutations
to handle only a single diff style (either inline or
parallel) and properly merge that with existing
files already in state (if any).