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

Conflicts:
	src/mkreleasehdr.sh