MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

usage message

Browse Source
This commit is contained in:
Konstantin Bulenkov
2012-05-05 21:06:49 +02:00
parent 81175ca878
commit 42687e97fe
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/diff/MergeApplication.java
+2 -2
View File
@@ -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
platform/platform-resources-en/src/messages/DiffBundle.properties
-1
View File
@@ -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}