Merge branch 'ab/xdiff-bug-cleanup' into seen
authorJunio C Hamano <gitster@pobox.com>
Sat, 19 Jun 2021 07:30:21 +0000 (16:30 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 19 Jun 2021 07:30:22 +0000 (16:30 +0900)
commit4a7ca460f80525283d7537baf9a5d1f3691475c8
treec4b9b3f1ebfda75adff0a070182a99e3cafc5f32
parentbb402f42b3ff1687ffffc022531a69cf7e18389e
parent546096a5cbb4806462d0e8e8fa4a562fc173aa8d
Merge branch 'ab/xdiff-bug-cleanup' into seen

Code clean-up.

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