X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge.sh;h=8026ccff4a459a75148740382646f7fe10b00255;hb=8bcff62baf7a17864620964c60d3a02d7c5b8d77;hp=5fc5f5201f8ea8e155a25795b93bfea86fc12d12;hpb=8366b7baae7e5a33f609b07c939a3571653a2314;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 5fc5f5201..8026ccff4 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -13,7 +13,7 @@ n                    don't show a diffstat at the end of the merge
 summary              (synonym to --stat)
 log                  add list of one-line log to merge commit message
 squash               create a single commit instead of doing a merge
-commit               perform a commit if the merge sucesses (default)
+commit               perform a commit if the merge succeeds (default)
 ff                   allow fast forward (default)
 s,strategy=          merge strategy to use
 m,message=           message to be used for the merge commit (if any)