summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-04 08:02:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-04 08:02:08 (GMT)
commitbf96c931994382d99e4e4d55f7b22b6779787a9d (patch)
treee8d2108a32b9ad90089933b8c73926a82d4473e8
parente11d7b5969704cd5ce39d053414d905bb203886b (diff)
downloadgit-bf96c931994382d99e4e4d55f7b22b6779787a9d.zip
git-bf96c931994382d99e4e4d55f7b22b6779787a9d.tar.gz
git-bf96c931994382d99e4e4d55f7b22b6779787a9d.tar.bz2
Fix bit assignment for CE_CONFLICTED
CE_WT_REMOVE has already grabbed the same value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index da8ec92..7759c2c 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