diff options
author | Elijah Newren <newren@gmail.com> | 2019-11-05 17:07:23 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-11-10 16:00:54 +0900 |
commit | 15beaaa3d1f6b555900446deb5e376b4f806d734 (patch) | |
tree | 96a960cd2c0c9b1cceeb9c7f5ed46680ba5e67b9 /diff.c | |
parent | Fix spelling errors in documentation outside of Documentation/ (diff) | |
download | tgif-15beaaa3d1f6b555900446deb5e376b4f806d734.tar.xz |
Fix spelling errors in code comments
Reported-by: Jens Schleusener <Jens.Schleusener@fossies.org>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2551,7 +2551,7 @@ static int scale_linear(int it, int width, int max_change) /* * make sure that at least one '-' or '+' is printed if * there is any change to this path. The easiest way is to - * scale linearly as if the alloted width is one column shorter + * scale linearly as if the allotted width is one column shorter * than it is, and then add 1 to the result. */ return 1 + (it * (width - 1) / max_change); @@ -3196,7 +3196,7 @@ static int is_conflict_marker(const char *line, int marker_size, unsigned long l for (cnt = 1; cnt < marker_size; cnt++) if (line[cnt] != firstchar) return 0; - /* line[1] thru line[marker_size-1] are same as firstchar */ + /* line[1] through line[marker_size-1] are same as firstchar */ if (len < marker_size + 1 || !isspace(line[marker_size])) return 0; return 1; |