From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Dec 2019 19:22:01 +0000 (-0800)
Subject: Merge branch 'rs/xdiff-ignore-ws-w-func-context'
X-Git-Tag: v2.25.0-rc0~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0c6a7459410592a7c9ae95080e349015b890900;p=thirdparty%2Fgit.git

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
---

c0c6a7459410592a7c9ae95080e349015b890900