From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Dec 2023 22:10:13 +0000 (-0800)
Subject: Merge branch 'ad/merge-file-diff-algo'
X-Git-Tag: v2.44.0-rc0~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78956864b095fb8f9336c46c2573d28cd6ee601e;p=thirdparty%2Fgit.git

Merge branch 'ad/merge-file-diff-algo'

"git merge-file" learned to take the "--diff-algorithm" option to
use algorithm different from the default "myers" diff.

* ad/merge-file-diff-algo:
  merge-file: add --diff-algorithm option
---

78956864b095fb8f9336c46c2573d28cd6ee601e