Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: reset: add some missing tables
[gitweb.git]
/
cache.h
diff --git
a/cache.h
b/cache.h
index bf468e52352c193b355222b718d9f5125c26052c..7759c2cf94e41c4b85e178b77411293fe2a6d3e1 100644
(file)
--- a/
cache.h
+++ b/
cache.h
@@
-177,6
+177,7
@@
struct cache_entry {
#define CE_HASHED (0x100000)
#define CE_UNHASHED (0x200000)
+#define CE_CONFLICTED (0x800000)
/*
* Extended on-disk flags