From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Jan 2010 08:02:00 +0000 (-0800)
Subject: Fix bit assignment for CE_CONFLICTED
X-Git-Tag: v1.7.0-rc0~98^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bf96c931994382d99e4e4d55f7b22b6779787a9d;p=git.git

Fix bit assignment for CE_CONFLICTED

CE_WT_REMOVE has already grabbed the same value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/cache.h b/cache.h
index da8ec9241..7759c2cf9 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