diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-04 11:02:00 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-04 11:02:08 +0300 |
| commit | bf96c931994382d99e4e4d55f7b22b6779787a9d (patch) | |
| tree | e8d2108a32b9ad90089933b8c73926a82d4473e8 /cache.h | |
| parent | e11d7b5969704cd5ce39d053414d905bb203886b (diff) | |
Fix bit assignment for CE_CONFLICTED
CE_WT_REMOVE has already grabbed the same value.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |