git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-20 06:35:47 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Fix bit assignment for CE_CONFLICTED

Browse Source 
CE_WT_REMOVE has already grabbed the same value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2010-01-04 00:02:00 -08:00
parent e11d7b5969
commit bf96c93199
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cache.h
View File

@@ -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