diff options
-rw-r--r-- | cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -177,7 +177,7 @@ struct cache_entry { #define CE_HASHED (0x100000) #define CE_UNHASHED (0x200000) -#define CE_CONFLICTED (0x400000) +#define CE_CONFLICTED (0x800000) /* * Extended on-disk flags |