Add diff support
Resolved conflicts Makevars when merge diff support
Merge branch 'metacran-feature-diff'