diff options
author | Elijah Newren <newren@gmail.com> | 2025-03-16 06:58:55 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2025-03-17 15:39:03 -0700 |
commit | e40eefba02d684253bc5102eaa921db7ddd21128 (patch) | |
tree | 11176226c171bf4aa695b3cdb9e0a2171f1083ab /builtin/commit-tree.c | |
parent | 683c54c999c301c2cd6f715c411407c413b1d84e (diff) |
stash: remove merge-recursive.h include
stash was modified to use merge_ort_nonrecursive() instead of
merge_recursive_generic() back in commit 874cf2a60444 (stash: apply
stash using 'merge_ort_nonrecursive()', 2022-05-10). That makes the
inclusion of merge-recursive.h unnecessary. In preparation for the
removal of merge-recursive.h, remove the unnecessary include.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions