Merge branch 'nd/ls-remote-does-not-have-u-option' into maint

diff --git a/builtin/apply.c b/builtin/apply.c
index 54aba4e351257f8bc4b46d3f507c1ed9525ec7fc..4aa53f7fd87d5fd23c0929360b6746f48e8e3e73 100644 (file)
--- 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?
  */