Upgraded diff to 3.2.  #859
Merge pull request #2254 from openscholar/859-diff

Upgraded diff to 3.2.  #859