summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2009-08-30 20:27:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-30 21:13:01 (GMT)
commit97bf2a08095197f43b20b3bc1124552ae24d71bf (patch)
treedd04bad2d3b92b01d7e8bec4d8e0b3d3d8c7c134
parent0e098b6d79fbcab763874f2b6fde5aa82144d150 (diff)
downloadgit-97bf2a08095197f43b20b3bc1124552ae24d71bf.zip
git-97bf2a08095197f43b20b3bc1124552ae24d71bf.tar.gz
git-97bf2a08095197f43b20b3bc1124552ae24d71bf.tar.bz2
diff.c: fix typoes in comments
Should be squashed when we reroll 'next' into the main commit.
-rw-r--r--diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index 91d6ea2..24bd3fc 100644
--- a/diff.c
+++ b/diff.c
@@ -2382,7 +2382,7 @@ int diff_setup_done(struct diff_options *options)
* Most of the time we can say "there are changes"
* only by checking if there are changed paths, but
* --ignore-whitespace* options force us to look
- * inside contets.
+ * inside contents.
*/
if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
@@ -3346,7 +3346,7 @@ free_queue:
fclose(options->file);
/*
- * Report the contents level differences with HAS_CHANGES;
+ * Report the content-level differences with HAS_CHANGES;
* diff_addremove/diff_change does not set the bit when
* DIFF_FROM_CONTENTS is in effect (e.g. with -w).
*/