diff options
| author | Elijah Newren <newren@gmail.com> | 2025-04-08 15:48:39 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 13:59:12 -0700 |
| commit | 75cd9ae05fbc9d3e9ccbd8923f4fad76b3ec609f (patch) | |
| tree | ab2fae9df47029052aacb0896470de260c86d66a /merge-recursive.c | |
| parent | sequencer: switch non-recursive merges over to ort (diff) | |
| download | git-75cd9ae05fbc9d3e9ccbd8923f4fad76b3ec609f.tar.gz git-75cd9ae05fbc9d3e9ccbd8923f4fad76b3ec609f.zip | |
merge, sequencer: switch recursive merges over to ort
More precisely, replace calls to merge_recursive() with
merge_ort_recursive().
Also change t7615 to quit calling out recursive; it is not needed
anymore, and we are in fact using ort now.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions