Commit Diff


commit - 6bb30d9ac5bf8593ff093c65c5c6b9e1e596df0a
commit + d0b44960142368b275a21395ef0ad4109244069c
blob - c1fb90517805757d7828029aaa8e56e5b63a4b30
blob + b0d1cc7239e701176d2a4a0c126a32360d8ba737
--- lib/got_file_index_priv.h
+++ lib/got_file_index_priv.h
@@ -53,7 +53,7 @@ struct got_file_index_entry {
 	const char *path;
 };
 
-/* "Stages" of a file which is afflicted by a 3-way merge conflict. */
+/* "Stages" of a file afflicted by a 3-way merge conflict. */
 #define GOT_INDEX_ENTRY_STAGE_MERGED	0
 #define GOT_INDEX_ENTRY_STAGE_ANCESTOR	1
 #define GOT_INDEX_ENTRY_STAGE_OURS	2