Merge "Permit cache.diff.intraline to disable MyersDiff"