Fix bit assignment for CE_CONFLICTED

CE_WT_REMOVE has already grabbed the same value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · Jan 4, 2010 · bf96c93 · bf96c93
1 parent e11d7b5
commit bf96c93
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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