From 75b60afe41f6ef53f7246150aa7648ba414720b4 Mon Sep 17 00:00:00 2001 From: Tomasz Zarna Date: Sun, 20 May 2012 12:00:46 +0200 Subject: Typo in CLIText#unknownMergeStratey, should be #unknownMergeStrategy Change-Id: I4d4aa59723d6422ff755165e45f368da76d309ab Signed-off-by: Robin Rosenberg --- org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'org.eclipse.jgit.pgm/resources') 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 -- cgit v1.2.3