Merge branch 'nd/diff-parseopt-2'

diff --git a/cache.h b/cache.h
index bff556e7720b2aec7c2824b7101a0c5bd175551b..abd518a9a23394fd47b572c6957c712abac139a2 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -9,6 +9,7 @@
 #include "gettext.h"
 #include "convert.h"
 #include "trace.h"
+#include "trace2.h"
 #include "string-list.h"
 #include "pack-revindex.h"
 #include "hash.h"