suppress external diff program when using git diff.
Merge branch 'fix-git-diff' of github.com:0x20h/redis into fix-git-diff