diff options
| author | Tomasz Zarna <Tomasz.Zarna@pl.ibm.com> | 2012-05-20 12:00:46 +0200 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2012-07-14 15:15:31 +0200 |
| commit | 75b60afe41f6ef53f7246150aa7648ba414720b4 (patch) | |
| tree | 8a033dd9846ebab530ef502aed9e2c8a396d15c4 /org.eclipse.jgit.pgm/src/org/eclipse | |
| parent | 130925b879199a3747392766cf587c84b4c26a94 (diff) | |
| download | jgit-75b60afe41f6ef53f7246150aa7648ba414720b4.tar.gz jgit-75b60afe41f6ef53f7246150aa7648ba414720b4.zip | |
Typo in CLIText#unknownMergeStratey, should be #unknownMergeStrategy
Change-Id: I4d4aa59723d6422ff755165e45f368da76d309ab
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
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 |