commit - d6c87207755e1465c12ad4f1620f634b5b1848c0
commit + 9714e35f37d138ec783d6814c4becce70454ea7f
blob - d12affdac074ff5191c64ab279d7a440c809fa0d
blob + 19f400aad58526650990b88d2d48d7f7dd8aa352
--- lib/fileindex.c
+++ lib/fileindex.c
@@ -37,9 +37,6 @@
 
 /* got_fileindex_entry flags */
 #define GOT_FILEIDX_F_PATH_LEN		0x00000fff
-#define GOT_FILEIDX_F_STAGE		0x00003000
-#define GOT_FILEIDX_F_EXTENDED		0x00004000
-#define GOT_FILEIDX_F_ASSUME_VALID	0x00008000
 #define GOT_FILEIDX_F_NOT_FLUSHED	0x00010000
 #define GOT_FILEIDX_F_NO_BLOB		0x00020000
 #define GOT_FILEIDX_F_NO_COMMIT		0x00040000
blob - f1d45067cc2bc9cfaae5350605b91b06a58f738f
blob + f9c79663bb1df89f3299e244b6725836ffdceb48
--- lib/got_lib_fileindex.h
+++ lib/got_lib_fileindex.h
@@ -56,16 +56,8 @@ struct got_fileindex_entry {
 	 */
 	char *path;
 	size_t path_len; /* strlen(path) -- kept in memory only! */
-
-	/* More data could be here if F_EXTENDED is set; To be determined... */
 };
 
-/* "Stages" of a file afflicted by a 3-way merge conflict. */
-#define GOT_FILEIDX_STAGE_MERGED	0
-#define GOT_FILEIDX_STAGE_ANCESTOR	1
-#define GOT_FILEIDX_STAGE_OURS		2
-#define GOT_FILEIDX_STAGE_THEIRS	3
-
 struct got_fileindex;
 
 RB_HEAD(got_fileindex_tree, got_fileindex_entry);