diff options
| author | Elijah Newren <newren@gmail.com> | 2023-05-16 08:34:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-21 22:39:53 +0200 |
| commit | df6e8744966bfa66ff289f58372bb060fdc6a124 (patch) | |
| tree | 7267d8461f4322e931b8b407627c497d6485b538 /builtin/merge-ours.c | |
| parent | repository: remove unnecessary include of path.h (diff) | |
| download | git-df6e8744966bfa66ff289f58372bb060fdc6a124.tar.xz git-df6e8744966bfa66ff289f58372bb060fdc6a124.zip | |
diff.h: remove unnecessary include of oidset.h
This also made it clear that several .c files depended upon various
things that oidset included, but had omitted the direct #include for
those headers. Add those now.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
| -rw-r--r-- | builtin/merge-ours.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index c2e519301e..932924e5d0 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -10,6 +10,7 @@ #include "git-compat-util.h" #include "builtin.h" #include "diff.h" +#include "repository.h" static const char builtin_merge_ours_usage[] = "git merge-ours <base>... -- HEAD <remote>..."; |