diff mbox series

[1/5] stash: remove merge-recursive.h include

Message ID d5611e8d666520d174c3839c10d55484657bb1b7.1742108339.git.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit e40eefba02d684253bc5102eaa921db7ddd21128
Headers show
Series Miscellaneous fixups preparing for the removal of merge-recursive | expand

Commit Message

Elijah Newren March 16, 2025, 6:58 a.m. UTC 
From: Elijah Newren <newren@gmail.com>

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>
---
 builtin/stash.c | 1 -
 1 file changed, 1 deletion(-)
diff mbox series

Patch

diff --git a/builtin/stash.c b/builtin/stash.c
index dbaa999cf17..cfbd92852a6 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"