diff options
| author | Vicent Marti <tanoku@gmail.com> | 2013-05-01 17:31:23 +0400 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2013-05-01 17:31:23 +0400 |
| commit | e1807113c43b7c5008e2d5c8c449ae56c8dceeb4 (patch) | |
| tree | fa1222e2333699be7a39652768ab150bd5f827d4 /src/index.c | |
| parent | 2ba55c1f0df3400c15dbdd7b21d1f3d354ab2e3c (diff) | |
merge: Warning noise
Diffstat (limited to 'src/index.c')
| -rw-r--r-- | src/index.c | 3 |
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; |