diff options
| author | David Aguilar <davvid@gmail.com> | 2014-09-14 07:40:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-15 19:05:14 (GMT) |
| commit | 1c4b6604126781361fe89d88ace70f53079fbab5 (patch) | |
| tree | 125f774a940ef6470dd828d5393a7c7500ea5b5b /merge-recursive.c | |
| parent | 96db324a73fdada6fbe7b63221986f8f18cc63b0 (diff) | |
| download | git-1c4b6604126781361fe89d88ace70f53079fbab5.zip git-1c4b6604126781361fe89d88ace70f53079fbab5.tar.gz git-1c4b6604126781361fe89d88ace70f53079fbab5.tar.bz2 | |
cleanups: ensure that git-compat-util.h is included first
CodingGuidelines states that the first #include in C files should be
git-compat-util.h or another header file that includes it, such as
cache.h or builtin.h.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 1d332b8..b55a005 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3,8 +3,8 @@ * Fredrik Kuivinen. * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006 */ -#include "advice.h" #include "cache.h" +#include "advice.h" #include "cache-tree.h" #include "commit.h" #include "blob.h" |