summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index da8ec92415..7759c2cf94 100644
--- a/cache.h
+++ b/cache.h
@@ -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