From 42687e97fe2c49ae51b5e54a8fda1bb14192cd03 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Sat, 5 May 2012 21:06:49 +0200
Subject: [PATCH] usage message

---
 .../src/com/intellij/openapi/diff/MergeApplication.java       | 4 ++--
 .../platform-resources-en/src/messages/DiffBundle.properties  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/diff/MergeApplication.java b/platform/platform-api/src/com/intellij/openapi/diff/MergeApplication.java
index 31a0ea68153e..b8053f0f2dbc 100644
--- a/platform/platform-api/src/com/intellij/openapi/diff/MergeApplication.java
+++ b/platform/platform-api/src/com/intellij/openapi/diff/MergeApplication.java
@@ -30,8 +30,8 @@ public class MergeApplication extends ApplicationStarterBase {
 
   @Override
   public String getUsageMessage() {
-    final String scriptName = ApplicationNamesInfo.getInstance().getScriptName();
-    return DiffBundle.message("merge.application.usage.parameters.and.description", scriptName);
+    final String script = ApplicationNamesInfo.getInstance().getScriptName();
+    return String.format("Usage:\n\t%s merge <file1> <file2> <original>\n\t%s merge <file1> <file2> <original> <output>", script, script);
   }
 
   @Override
diff --git a/platform/platform-resources-en/src/messages/DiffBundle.properties b/platform/platform-resources-en/src/messages/DiffBundle.properties
index 438428aeca29..4f47dd7b7101 100644
--- a/platform/platform-resources-en/src/messages/DiffBundle.properties
+++ b/platform/platform-resources-en/src/messages/DiffBundle.properties
@@ -1,5 +1,4 @@
 diff.application.usage.parameters.and.description=Usage: {0} diff <file1> <file2>
-merge.application.usage.parameters.and.description=Usage: {0} merge <file1> <file2> <result>
 
 cannot.file.file.error=Cannot find file: {0}
 cannot.create.diff.error=Cannot create diff element from: {0}