Update diffmerge v4.2.0.697
Merge pull request #1295 from hanxue/diffmerge

Update DiffMerge to v4.2.0.697