summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-09-14 11:44:43 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-14 11:44:44 -0700
commite0eeba263c19f0cd2e5ca3cad305d61b2d837a63 (patch)
treee27a2f6efdea0556512a2a5e663495d88eb3fa97
parentMerge git://bogomips.org/git-svn (diff)
parentapply: comment grammar fix (diff)
downloadtgif-e0eeba263c19f0cd2e5ca3cad305d61b2d837a63.tar.xz
Merge branch 'gb/apply-comment-typofix'
* gb/apply-comment-typofix: apply: comment grammar fix
-rw-r--r--builtin/apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index 54aba4e351..4aa53f7fd8 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -785,7 +785,7 @@ static int guess_p_value(const char *nameline)
}
/*
- * Does the ---/+++ line has the POSIX timestamp after the last HT?
+ * Does the ---/+++ line have the POSIX timestamp after the last HT?
* GNU diff puts epoch there to signal a creation/deletion event. Is
* this such a timestamp?
*/