From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Sep 2015 18:44:43 +0000 (-0700)
Subject: Merge branch 'gb/apply-comment-typofix'
X-Git-Tag: v2.6.0-rc2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e0eeba263c19f0cd2e5ca3cad305d61b2d837a63?hp=1962994f08e7a193998fd0319f02109ed0153447

Merge branch 'gb/apply-comment-typofix'

* gb/apply-comment-typofix:
apply: comment grammar fix
---

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?
  */