diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-03-29 16:39:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-29 16:39:10 +0900 |
| commit | ff926a6d1b37a8c7c675bc8f8931474bdb525e8c (patch) | |
| tree | 3c1c6f5b2836e5b006540bba530667877cc372a5 /builtin/stash.c | |
| parent | 6767149eca352db846ae065fa67614a1b4bc45a6 (diff) | |
| parent | a18c18b470f108c70717ed22c0ab5b892c6d3683 (diff) | |
| download | git-ff926a6d1b37a8c7c675bc8f8931474bdb525e8c.tar.gz | |
Merge branch 'en/random-cleanups'
Miscellaneous code clean-ups.
* en/random-cleanups:
merge-ort: remove extraneous word in comment
merge-ort: fix accidental strset<->strintmap
t7615: be more explicit about diff algorithm used
t6423: fix a comment that accidentally reversed two commits
stash: remove merge-recursive.h include
Diffstat (limited to 'builtin/stash.c')
| -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" |