aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2012-05-20 06:00:46 (EDT)
committerRobin Rosenberg2012-07-14 09:15:31 (EDT)
commit75b60afe41f6ef53f7246150aa7648ba414720b4 (patch)
tree8a033dd9846ebab530ef502aed9e2c8a396d15c4
parent130925b879199a3747392766cf587c84b4c26a94 (diff)
downloadjgit-75b60afe41f6ef53f7246150aa7648ba414720b4.zip
jgit-75b60afe41f6ef53f7246150aa7648ba414720b4.tar.gz
jgit-75b60afe41f6ef53f7246150aa7648ba414720b4.tar.bz2
Typo in CLIText#unknownMergeStratey, should be #unknownMergeStrategyrefs/changes/40/6040/2
Change-Id: I4d4aa59723d6422ff755165e45f368da76d309ab Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
-rw-r--r--org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties2
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java2
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java2
3 files changed, 3 insertions, 3 deletions
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 f0ab55f..49bab03 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 b3b2383..3b815f4 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 7928a28..4cd82b8 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