diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-07-31 13:34:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-31 13:34:16 -0700 |
| commit | f084c50de6b584f3c2fd2af3550c53f4f238d19b (patch) | |
| tree | 88a1f0aa9ea2922f42f249ae64e2c530aead39b1 /builtin/merge.c | |
| parent | 6a52f307af0e53aac2fcab8f995f69789472c334 (diff) | |
| parent | 9c93ba4d0aee1bc8c663a13552afd2b2c22863a9 (diff) | |
| download | git-f084c50de6b584f3c2fd2af3550c53f4f238d19b.tar.gz | |
Merge branch 'ad/merge-with-diff-algorithm'
Many Porcelain commands that internally use the merge machinery
were taught to consistently honor the diff.algorithm configuration.
* ad/merge-with-diff-algorithm:
merge-recursive: honor diff.algorithm
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 9fba27d85d..c896b18d1a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -724,7 +724,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, return 2; } - init_merge_options(&o, the_repository); + init_ui_merge_options(&o, the_repository); if (!strcmp(strategy, "subtree")) o.subtree_shift = ""; |