Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
diff.c: fix typoes in comments
author
Jim Meyering
<jim@meyering.net>
Sun, 30 Aug 2009 20:27:02 +0000
(22:27 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 30 Aug 2009 21:13:01 +0000
(14:13 -0700)
Should be squashed when we reroll 'next' into the main commit.
diff.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
0e098b6
)
diff --git
a/diff.c
b/diff.c
index 91d6ea21a9d3575ea940e3d71e42609e800bed6b..24bd3fce3f8445e2d9a261a42fcb1eb85d2badfe 100644
(file)
--- 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
* 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 conte
n
ts.
*/
if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
*/
if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
@@
-3346,7
+3346,7
@@
void diff_flush(struct diff_options *options)
fclose(options->file);
/*
fclose(options->file);
/*
- * Report the content
s
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).
*/
* diff_addremove/diff_change does not set the bit when
* DIFF_FROM_CONTENTS is in effect (e.g. with -w).
*/