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 | |
| parent | Git 2.49 (diff) | |
| download | git-e40eefba02d684253bc5102eaa921db7ddd21128.tar.gz git-e40eefba02d684253bc5102eaa921db7ddd21128.zip | |
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>
| -rw-r--r-- | builtin/stash.c | 1 |
1 files changed, 0 insertions, 1 deletions
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" |