X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-config.txt;h=1e5c22c5e5c19dab5d5c35ec2401870237830a5d;hb=8c0db6fd51cec5fd82cf4054818c0a1ca4a58f37;hp=92772e7c4eb8921d3b2763fe1b533c380bd2b92b;hpb=09a8fbd59cb18c222db732e053c17583f7f06840;p=git.git

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 92772e7c4..1e5c22c5e 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -10,7 +10,7 @@ merge.log::
 	In addition to branch names, populate the log message with at
 	most the specified number of one-line descriptions from the
 	actual commits that are being merged.  Defaults to false, and
-	true is a synoym for 20.
+	true is a synonym for 20.
 
 merge.renameLimit::
 	The number of files to consider when performing rename detection