Change diff method
Merge branch 'master' of https://github.com/ivan-project/diff