projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e11d7b5
)
Fix bit assignment for CE_CONFLICTED
author
Junio C Hamano
<gitster@pobox.com>
Mon, 4 Jan 2010 08:02:00 +0000
(
00:02
-0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 4 Jan 2010 08:02:08 +0000
(
00:02
-0800)
CE_WT_REMOVE has already grabbed the same value.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
cache.h
patch
|
blob
|
history
diff --git
a/cache.h
b/cache.h
index da8ec92415eed9cb0de9cae18eef8f2720a672c8..7759c2cf94e41c4b85e178b77411293fe2a6d3e1 100644
(file)
--- a/
cache.h
+++ b/
cache.h
@@
-177,7
+177,7
@@
struct cache_entry {
#define CE_HASHED (0x100000)
#define CE_UNHASHED (0x200000)
-#define CE_CONFLICTED (0x
4
00000)
+#define CE_CONFLICTED (0x
8
00000)
/*
* Extended on-disk flags