]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit78956864b095fb8f9336c46c2573d28cd6ee601e
tree7e56400ac44a30a34e5dd897cd5bca2bd073dc65tree
parentcacf27bf8229412ec48a572e42ba06e9c7e751a9commit | diff
parent4f7fd79e57f483282bc21bf5b0669f9c8229d32acommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.