Added --no-ext-diff option to `git diff` command to avoid
invoking external diff tools.
Merge pull request #39 from edx/will/disable-external-diff

Added --no-ext-diff option to `git diff` command