summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2014-09-14 00:40:45 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-15 12:05:14 -0700
commit1c4b6604126781361fe89d88ace70f53079fbab5 (patch)
tree125f774a940ef6470dd828d5393a7c7500ea5b5b /merge-recursive.c
parent96db324a73fdada6fbe7b63221986f8f18cc63b0 (diff)
downloadgit-1c4b6604126781361fe89d88ace70f53079fbab5.tar.gz
cleanups: ensure that git-compat-util.h is included firstda/include-compat-util-first-in-c
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 1d332b8bbb..b55a0056e4 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"