]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sg/line-log-boundary-fixes' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Sep 2025 17:42:33 +0000 (10:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Sep 2025 17:42:34 +0000 (10:42 -0700)
Fix for a corner case bug in "git log -L...".

* sg/line-log-boundary-fixes:
  line-log: show all line ranges touched by the same diff range
  line-log: fix assertion error

1  2 
line-log.c

diff --cc line-log.c
Simple merge