Merge branch 'gb/apply-comment-typofix'

gitster · gitster · commit e0eeba263c19 · 2015-09-14T11:44:44.000-07:00
* gb/apply-comment-typofix:
  apply: comment grammar fix
diff --git 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?
  */

Original file line number	Diff line number	Diff line change
`@@ -785,7 +785,7 @@ static int guess_p_value(const char *nameline)`
`785`	`785`	`}`
`786`	`786`
`787`	`787`	`/*`
`788`		`- * Does the ---/+++ line has the POSIX timestamp after the last HT?`
	`788`	`+ * Does the ---/+++ line have the POSIX timestamp after the last HT?`
`789`	`789`	`* GNU diff puts epoch there to signal a creation/deletion event. Is`
`790`	`790`	`* this such a timestamp?`
`791`	`791`	`*/`