diff options
| author | Antonin Delpeuch <antonin@delpeuch.eu> | 2023-11-20 19:18:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-22 14:23:06 +0900 |
| commit | 4f7fd79e57f483282bc21bf5b0669f9c8229d32a (patch) | |
| tree | bdb53d009940ab6aa32c4f903c7fc8030769635f /builtin/commit-graph.c | |
| parent | 564d0252ca632e0264ed670534a51d18a689ef5d (diff) | |
merge-file: add --diff-algorithm option
Make it possible to use other diff algorithms than the 'myers'
default algorithm, when using the 'git merge-file' command, to help
avoid spurious conflicts by selecting a more recent algorithm such
as 'histogram', for instance when using 'git merge-file' as part of
a custom merge driver.
Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
Reviewed-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit-graph.c')
0 files changed, 0 insertions, 0 deletions