Merge branch 'jc/lockfile' into next

diff --git a/usage.c b/usage.c
index dfa87fe1191862b2c650e55fdd727802ef00cf34..1fa924c3d9ed8f70523685c26cf169316b366598 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#include "cache.h"
+#include "git-compat-util.h"
 
 static void report(const char *prefix, const char *err, va_list params)
 {