"reset --merge": fix unmerged case

diff --git a/cache.h b/cache.h
index bf468e52352c193b355222b718d9f5125c26052c..da8ec92415eed9cb0de9cae18eef8f2720a672c8 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 (0x400000)
 
 /*
  * Extended on-disk flags