Typo in CLIText#unknownMergeStratey, should be #unknownMergeStrategy

Change-Id: I4d4aa59723d6422ff755165e45f368da76d309ab
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>

org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties

@@ -135,7 +135,7 @@ serviceNotSupported=Service '{0}' not supported
 skippingObject=skipping {0} {1}
 timeInMilliSeconds={0} ms
 tooManyRefsGiven=Too many refs given
-unknownMergeStratey=unknown merge strategy {0} specified
+unknownMergeStrategy=unknown merge strategy {0} specified
 unsupportedOperation=Unsupported operation: {0}
 usage_Blame=Show what revision and author last modified each line
 usage_CommandLineClientForamazonsS3Service=Command line client for Amazon's S3 service

org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java

@@ -182,7 +182,7 @@ public class CLIText extends TranslationBundle {
 	/***/ public String skippingObject;
 	/***/ public String timeInMilliSeconds;
 	/***/ public String tooManyRefsGiven;
-	/***/ public String unknownMergeStratey;
+	/***/ public String unknownMergeStrategy;
 	/***/ public String unsupportedOperation;
 	/***/ public String warningNoCommitGivenOnCommandLine;
 }

org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java

@@ -72,7 +72,7 @@ class Merge extends TextBuiltin {
 			mergeStrategy = MergeStrategy.get(strategyName);
 			if (mergeStrategy == null)
 				throw die(MessageFormat.format(
-						CLIText.get().unknownMergeStratey, strategyName));
+						CLIText.get().unknownMergeStrategy, strategyName));
 		}
 
 		// determine the other revision we want to merge with HEAD