diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-16 21:08:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-16 21:08:32 (GMT) |
| commit | f0070a7df98540ebd0ba6ecb7aef4620efe27724 (patch) | |
| tree | 7709292d94464899030197ae1b412c3a4734d0b2 /pathspec.h | |
| parent | 71a7de7a99a3199a9ea0660287bd4c1747f4d3b6 (diff) | |
| parent | 0bb313a5529390276cf5c415891c804dea44fa34 (diff) | |
| download | git-f0070a7df98540ebd0ba6ecb7aef4620efe27724.zip git-f0070a7df98540ebd0ba6ecb7aef4620efe27724.tar.gz git-f0070a7df98540ebd0ba6ecb7aef4620efe27724.tar.bz2 | |
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
Diffstat (limited to 'pathspec.h')
0 files changed, 0 insertions, 0 deletions