From: Junio C Hamano Date: Thu, 8 Jul 2021 20:15:04 +0000 (-0700) Subject: Merge branch 'ab/xdiff-bug-cleanup' X-Git-Tag: v2.33.0-rc0~77 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e48f115aa742e2389beda39fa08e9d96ec9b084;p=thirdparty%2Fgit.git Merge branch 'ab/xdiff-bug-cleanup' Code clean-up. * ab/xdiff-bug-cleanup: xdiff: use BUG(...), not xdl_bug(...) --- 8e48f115aa742e2389beda39fa08e9d96ec9b084