summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2007-12-12 08:12:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-12 18:59:22 (GMT)
commit0ac7903ee3c7c93d2426a4aa4f3732bee73e0365 (patch)
tree5f01de39e619c19b0e6857f5b9db94bc4fc1b0d9 /diff.c
parent472b25709900723a35b404456ae8e28bfc446932 (diff)
downloadgit-0ac7903ee3c7c93d2426a4aa4f3732bee73e0365.zip
git-0ac7903ee3c7c93d2426a4aa4f3732bee73e0365.tar.gz
git-0ac7903ee3c7c93d2426a4aa4f3732bee73e0365.tar.bz2
Use "whitespace" consistently
For consistency, change "white space" and "whitespaces" to "whitespace", fixing a couple of adjacent grammar problems in the docs. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index f780e3e..e74a303 100644
--- a/diff.c
+++ b/diff.c
@@ -1015,7 +1015,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
if (line[i - 1] == '\t' && spaces)
space_before_tab = 1;
- /* check white space at line end */
+ /* check whitespace at line end */
if (line[len - 1] == '\n')
len--;
if (isspace(line[len - 1]))
@@ -1029,7 +1029,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
putchar(',');
}
if (white_space_at_end)
- printf("white space at end");
+ printf("whitespace at end");
printf(":%s ", reset);
emit_line_with_ws(1, set, reset, ws, line, len,
data->ws_rule);