1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index bf468e5235..da8ec92415 100644
--- a/cache.h
+++ b/cache.h
@@ -177,6 +177,7 @@ struct cache_entry {
 
 #define CE_HASHED    (0x100000)
 #define CE_UNHASHED  (0x200000)
+#define CE_CONFLICTED (0x400000)
 
 /*
  * Extended on-disk flags