diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-19 16:14:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-19 16:14:49 -0700 |
| commit | 93121dfd8c1aaed387fe4d5af7597cf0a675199b (patch) | |
| tree | a8a202008e33735e6b5fa9cb878053b4c760ed66 /builtin/commit.c | |
| parent | 4499a42d0cb774c1ed6953d03226b7cbe0756af7 (diff) | |
| parent | c2ebaa27d63bfb7c50cbbdaba90aee4efdd45d0a (diff) | |
Merge branch 'jk/blame-coalesce-fix'
When given more than one target line ranges, "git blame -La,b
-Lc,d" was over-eager to coalesce groups of original lines and
showed incorrect results, which has been corrected.
* jk/blame-coalesce-fix:
blame: only coalesce lines that are adjacent in result
t8003: factor setup out of coalesce test
t8003: check output of coalesced blame
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions