Merge branch 'cc/reset-more'

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index 46606477b626c9bdb6a60f9c0cf826c8fc435e00..3e52c4efb1fba0577b18529afb8fcf75f51ddc2b 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -177,6 +177,7 @@ struct cache_entry {
 
 #define CE_HASHED    (0x100000)
 #define CE_UNHASHED  (0x200000)
+#define CE_CONFLICTED (0x800000)
 
 /* Only remove in work directory, not index */
 #define CE_WT_REMOVE (0x400000)