summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorOndřej Bílka <neleai@seznam.cz>2013-07-29 10:18:21 +0200
committerJunio C Hamano <gitster@pobox.com>2013-07-29 12:32:25 -0700
commit98e023dea40a0eca8a61c037dfc59aaf27f003a4 (patch)
treec36b17d6bc32ffdc55625c64ee61160f48ec5b5e /combine-diff.c
parent749f763dbbe4dbcc4082f02bf98bfc1a09427c6f (diff)
downloadgit-98e023dea40a0eca8a61c037dfc59aaf27f003a4.tar.gz
many small typofixesob/typofixes
Signed-off-by: Ondřej Bílka <neleai@seznam.cz> Reviewed-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 6dc06093d3..88525b37cf 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -165,7 +165,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
/*
* Coalesce new lines into base by finding the LCS
- * - Create the table to run dynamic programing
+ * - Create the table to run dynamic programming
* - Compute the LCS
* - Then reverse read the direction structure:
* - If we have MATCH, assign parent to base flag, and consume