diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-08-01 11:58:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-01 12:01:01 -0700 |
| commit | d50cb7569cfb6e04ba48900821618d28012f334e (patch) | |
| tree | 641264cefb155981b8861759cd39665ffcd04cd2 /combine-diff.c | |
| parent | Merge branch 'ms/subtree-install-fix' (diff) | |
| parent | many small typofixes (diff) | |
| download | tgif-d50cb7569cfb6e04ba48900821618d28012f334e.tar.xz | |
Merge branch 'ob/typofixes'
* ob/typofixes:
many small typofixes
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
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 |