From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Jul 2021 00:42:45 +0000 (-0700)
Subject: Merge branch 'en/ort-perf-batch-12'
X-Git-Tag: v2.33.0-rc0~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89efac81c716bb296098fd1c5482bac3ecb344c5;p=thirdparty%2Fgit.git

Merge branch 'en/ort-perf-batch-12'

More fix-ups and optimization to "merge -sort".

* en/ort-perf-batch-12:
  merge-ort: miscellaneous touch-ups
  Fix various issues found in comments
  diffcore-rename: avoid unnecessary strdup'ing in break_idx
  merge-ort: replace string_list_df_name_compare with faster alternative
---

89efac81c716bb296098fd1c5482bac3ecb344c5