From: Tomasz Zarna <Tomasz.Zarna@pl.ibm.com>
Date: Sun, 20 May 2012 10:00:46 +0000 (+0200)
Subject: Typo in CLIText#unknownMergeStratey, should be #unknownMergeStrategy
X-Git-Tag: v2.1.0.201209190230-r~53
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F6040%2F2;p=jgit.git

Typo in CLIText#unknownMergeStratey, should be #unknownMergeStrategy

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

diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
index f0ab55f696..49bab0374d 100644
--- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
+++ b/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
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
index b3b23837ae..3b815f457c 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
+++ b/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;
 }
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java
index 7928a2877b..4cd82b8225 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java
+++ b/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