Files
git/Documentation
Antonin Delpeuch 4f7fd79e57 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>
2023-11-22 14:23:06 +09:00
..
2023-11-20 10:28:15 +09:00
2023-10-30 07:09:55 +09:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2023-10-09 12:06:24 -07:00
2023-10-09 12:06:29 -07:00
2023-10-09 12:06:29 -07:00
2023-09-02 15:21:44 -07:00
2023-10-09 12:06:29 -07:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2023-10-23 13:56:37 -07:00
2021-12-10 14:35:03 -08:00
2023-05-16 11:38:14 -07:00
2023-10-09 12:06:24 -07:00
2023-10-09 12:06:29 -07:00
2023-10-05 12:55:38 -07:00
2023-10-09 12:06:29 -07:00
2023-10-09 12:06:29 -07:00
2023-08-28 09:16:06 -07:00
2023-10-09 12:04:21 -07:00