From: Elijah Newren <newren@gmail.com>
Date: Sun, 16 Mar 2025 06:58:55 +0000 (+0000)
Subject: stash: remove merge-recursive.h include
X-Git-Tag: v2.50.0-rc0~159^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e40eefba02d684253bc5102eaa921db7ddd21128;p=thirdparty%2Fgit.git

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>
---

diff --git a/builtin/stash.c b/builtin/stash.c
index dbaa999cf1..cfbd92852a 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -13,7 +13,6 @@
 #include "lockfile.h"
 #include "cache-tree.h"
 #include "unpack-trees.h"
-#include "merge-recursive.h"
 #include "merge-ort-wrappers.h"
 #include "strvec.h"
 #include "run-command.h"