From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Dec 2019 21:08:32 +0000 (-0800)
Subject: Merge branch 'rs/xdiff-ignore-ws-w-func-context'
X-Git-Tag: v2.25.0-rc0~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0070a7df98540ebd0ba6ecb7aef4620efe27724;p=thirdparty%2Fgit.git

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

The "diff" machinery learned not to lose added/removed blank lines
in the context when --ignore-blank-lines and --function-context are
used at the same time.

* rs/xdiff-ignore-ws-w-func-context:
  xdiff: unignore changes in function context
---

f0070a7df98540ebd0ba6ecb7aef4620efe27724