summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorPhillip Wood <phillip.wood@dunelm.org.uk>2018-11-23 11:16:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-10 18:37:42 (GMT)
commit748aa1aa34a316b8f26a3664f3fdcd273e1c5c39 (patch)
tree6d7e8edb44ccb3c9e0005da0a3637a399466fff8 /diff.c
parentfbafb7c682272e039e7aacbf8c0ef8de3c0eb157 (diff)
downloadgit-748aa1aa34a316b8f26a3664f3fdcd273e1c5c39.zip
git-748aa1aa34a316b8f26a3664f3fdcd273e1c5c39.tar.gz
git-748aa1aa34a316b8f26a3664f3fdcd273e1c5c39.tar.bz2
Use "whitespace" consistently
Most of the messages and documentation use 'whitespace' rather than 'white space' or 'white spaces' convert to latter two to the former for consistency. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index dc9965e..7fc92dc 100644
--- a/diff.c
+++ b/diff.c
@@ -320,7 +320,7 @@ static int parse_color_moved_ws(const char *arg)
if ((ret & COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) &&
(ret & XDF_WHITESPACE_FLAGS))
- die(_("color-moved-ws: allow-indentation-change cannot be combined with other white space modes"));
+ die(_("color-moved-ws: allow-indentation-change cannot be combined with other whitespace modes"));
string_list_clear(&l, 0);