Merge pull request #797 from yorah/fix/inter-hunk-context diff: make inter-hunk-context default value git-compliant