Merge pull request #1499 from arrbee/fix-diff-config-usage Support more diff config options and use the config cache more