git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 71a7de7 0bb313a)
Merge branch 'rs/xdiff-ignore-ws-w-func-context'
authorJunio C Hamano <redacted>
Mon, 16 Dec 2019 21:08:32 +0000 (13:08 -0800)
committerJunio C Hamano <redacted>
Mon, 16 Dec 2019 21:08:32 +0000 (13:08 -0800)
commitf0070a7df98540ebd0ba6ecb7aef4620efe27724
tree7709292d94464899030197ae1b412c3a4734d0b2tree | snapshot
parent71a7de7a99a3199a9ea0660287bd4c1747f4d3b6commit | diff
parent0bb313a5529390276cf5c415891c804dea44fa34commit | diff
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
t/t4015-diff-whitespace.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT