git-merge.sh: fix typo in usage message: sucesses --> succeeds
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey committed
Jun 18, 2008 at 15:16 UTC
037e98f20241bf013cd007b0924936a29c3cacfa
1 file changed
+1
-1
git-merge.sh
+1
-1
@@ -13,7 +13,7 @@ n don't show a diffstat at the end of the merge
13
summary (synonym to --stat)
14
log add list of one-line log to merge commit message
15
squash create a single commit instead of doing a merge
16
-commit perform a commit if the merge sucesses (default)
16
+commit perform a commit if the merge succeeds (default)
17
ff allow fast forward (default)
18
s,strategy= merge strategy to use
19
m,message= message to be used for the merge commit (if any)