diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-18 14:10:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-18 14:10:13 -0800 |
| commit | 78956864b095fb8f9336c46c2573d28cd6ee601e (patch) | |
| tree | 7e56400ac44a30a34e5dd897cd5bca2bd073dc65 /t/unit-tests/t-basic.c | |
| parent | Merge branch 'rs/column-leakfix' (diff) | |
| parent | merge-file: add --diff-algorithm option (diff) | |
| download | git-78956864b095fb8f9336c46c2573d28cd6ee601e.tar.gz git-78956864b095fb8f9336c46c2573d28cd6ee601e.zip | |
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
Diffstat (limited to 't/unit-tests/t-basic.c')
0 files changed, 0 insertions, 0 deletions