Merge branch 'va/mailinfo-doc-typofix'

gitster · gitster · commit 5bfc50d6fe58 · 2016-05-17T14:38:38.000-07:00
Typofix.

* va/mailinfo-doc-typofix:
  Documentation/git-mailinfo: fix typo
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
@@ -85,7 +85,7 @@ with comments and suggestions on the message you are responding to, and to
 conclude it with a patch submission, separating the discussion and the
 beginning of the proposed commit log message with a scissors line.
 +
-This can enabled by default with the configuration option mailinfo.scissors.
+This can be enabled by default with the configuration option mailinfo.scissors.
 
 --no-scissors::
 	Ignore scissors lines. Useful for overriding mailinfo.scissors settings.

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ with comments and suggestions on the message you are responding to, and to`
`85`	`85`	`conclude it with a patch submission, separating the discussion and the`
`86`	`86`	`beginning of the proposed commit log message with a scissors line.`
`87`	`87`	`+`
`88`		`-This can enabled by default with the configuration option mailinfo.scissors.`
	`88`	`+This can be enabled by default with the configuration option mailinfo.scissors.`
`89`	`89`
`90`	`90`	`--no-scissors::`
`91`	`91`	`Ignore scissors lines. Useful for overriding mailinfo.scissors settings.`