Merge branch 'rs/xdiff-ignore-ws-w-func-context'

Extend test coverage for a recent fix. * rs/xdiff-ignore-ws-w-func-context: t4015: improve coverage of function context test

Junio C Hamano committed Dec 25, 2019 at 11:22 UTC c0c6a7459410592a7c9ae95080e349015b890900

No changes.