commit 8bd7d41ff41f26775d745d1e511af43a24013e94
from: Martin Pieuchot <mpi@openbsd.org>
date: Fri Mar 20 17:00:04 2020 UTC

Use singular name

commit - 2f4de504f0166e0a055fa365272d152db41358fd
commit + 8bd7d41ff41f26775d745d1e511af43a24013e94
blob - 51c302c70b290279d7b2f5d6c5516f09586611ab
blob + 66efe86bc24a7dffe6d6b3200b6c590a6f7bcd79
--- diff.c
+++ diff.c
@@ -278,7 +278,7 @@ chunk_contexts_touch(const struct chunk_context *cc, c
 }
 
 static void
-chunk_contexts_merge(struct chunk_context *cc, const struct chunk_context *other)
+chunk_context_merge(struct chunk_context *cc, const struct chunk_context *other)
 {
 	ranges_merge(&cc->chunk, &other->chunk);
 	ranges_merge(&cc->left, &other->left);
@@ -391,7 +391,7 @@ output(const struct output_info *info, const struct di
 			 * This next context touches or overlaps the
 			 * previous one, join.
 			 */
-			chunk_contexts_merge(&cc, &next);
+			chunk_context_merge(&cc, &next);
 			continue;
 		}