Fix bit assignment for CE_CONFLICTED
CE_WT_REMOVE has already grabbed the same value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 4, 2010 at 00:02 UTC
bf96c931994382d99e4e4d55f7b22b6779787a9d
1 file changed
+1
-1
cache.h
+1
-1
@@ -177,7 +177,7 @@ struct cache_entry {
177
178
#define CE_HASHED (0x100000)
179
#define CE_UNHASHED (0x200000)
180
-#define CE_CONFLICTED (0x400000)
180
+#define CE_CONFLICTED (0x800000)
181
182
/*
183
* Extended on-disk flags