tree c2782be94b86163c422de32b8a1e0ed7eb16375f
parent b7bd70ddd4d38b16a1af6975df8077306ee998da
parent 546096a5cbb4806462d0e8e8fa4a562fc173aa8d
author Junio C Hamano <gitster@pobox.com> 1625775304 -0700
committer Junio C Hamano <gitster@pobox.com> 1625775304 -0700

Merge branch 'ab/xdiff-bug-cleanup'

Code clean-up.

* ab/xdiff-bug-cleanup:
  xdiff: use BUG(...), not xdl_bug(...)