diff options
Diffstat (limited to 'org.eclipse.jgit.pgm/src/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java | 2 |
2 files changed, 2 insertions, 2 deletions
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 |