]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cacf27b 4f7fd79)
Merge branch 'ad/merge-file-diff-algo'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Dec 2023 22:10:13 +0000 (14:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Dec 2023 22:10:13 +0000 (14:10 -0800)
"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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.