Fix bit assignment for CE_CONFLICTED

CE_WT_REMOVE has already grabbed the same value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-04 00:02:00 -08:00 · 2010-01-04 00:02:00 -08:00 · bf96c93199
parent e11d7b5969
commit bf96c93199
1 changed files with 1 additions and 1 deletions
--- 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