summaryrefslogtreecommitdiff
path: root/src/index.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/index.c')
-rw-r--r--src/index.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/index.c b/src/index.c
index a935c00db..1771f2957 100644
--- a/src/index.c
+++ b/src/index.c
@@ -209,6 +209,9 @@ static int conflict_name_cmp(const void *a, const void *b)
return strcmp(name_a->ours, name_b->ours);
}
+/**
+ * TODO: enable this when resolving case insensitive conflicts
+ */
static int conflict_name_icmp(const void *a, const void *b)
{
const git_index_name_entry *name_a = a;