From bf96c931994382d99e4e4d55f7b22b6779787a9d Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Jan 2010 00:02:00 -0800
Subject: [PATCH] Fix bit assignment for CE_CONFLICTED

CE_WT_REMOVE has already grabbed the same value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 cache.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.11.4.GIT