summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-24 19:23:00 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-24 19:23:01 -0700
commit0def7126fda12600017a1d8cd598ee0516cf60a2 (patch)
treeb6d32fc682657ea5511434178748a7a56a0f56bc /diff.c
parent4274cdf44a6f4929cdcec68b788d9a6991795ff4 (diff)
parent749f763dbbe4dbcc4082f02bf98bfc1a09427c6f (diff)
downloadgit-0def7126fda12600017a1d8cd598ee0516cf60a2.tar.gz
Merge branch 'ob/typofixes'
* ob/typofixes: typofix: in-code comments typofix: documentation typofix: release notes
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 4629de2092..266112ca61 100644
--- a/diff.c
+++ b/diff.c
@@ -4464,7 +4464,7 @@ void diff_flush(struct diff_options *options)
DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
/*
* run diff_flush_patch for the exit status. setting
- * options->file to /dev/null should be safe, becaue we
+ * options->file to /dev/null should be safe, because we
* aren't supposed to produce any output anyway.
*/
if (options->close_file)