diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-12-16 13:08:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-16 13:08:32 -0800 |
| commit | f0070a7df98540ebd0ba6ecb7aef4620efe27724 (patch) | |
| tree | 7709292d94464899030197ae1b412c3a4734d0b2 /builtin/merge-base.c | |
| parent | Merge branch 'dl/rebase-with-autobase' (diff) | |
| parent | xdiff: unignore changes in function context (diff) | |
| download | tgif-f0070a7df98540ebd0ba6ecb7aef4620efe27724.tar.xz | |
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 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions