Skip to content

Commit e40eefb

Browse files
newrengitster
authored andcommitted
stash: remove merge-recursive.h include
stash was modified to use merge_ort_nonrecursive() instead of merge_recursive_generic() back in commit 874cf2a (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 683c54c commit e40eefb

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

builtin/stash.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "lockfile.h"
1414
#include "cache-tree.h"
1515
#include "unpack-trees.h"
16-
#include "merge-recursive.h"
1716
#include "merge-ort-wrappers.h"
1817
#include "strvec.h"
1918
#include "run-command.h"

0 commit comments

Comments
 (0)