This commit is contained in:
Robin Green 2010-09-05 07:27:55 +08:00 committed by Phil Jakckson
parent 0d67135e89
commit 3dd1ef3a35

View file

@ -251,7 +251,7 @@
("M" "Automatic" magit-automatic-merge))
(switches
("-n" "No fast-forward" "--no-ff")
("-sq" "Squash" "--sqaush"))
("-sq" "Squash" "--squash"))
(arguments
("-st" "Strategy" "--strategy" read-from-minibuffer)))