Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Pazderski2019-04-05 13:19:52 -0400
committerPaul Pazderski2019-07-03 04:09:41 -0400
commit7907da8e73316345d971683cc5671026c313da1e (patch)
tree74f2688810cdfda89b535978d3e431b0cd2b943d /org.eclipse.debug.ui/ui/org/eclipse/debug/internal
parent4b951888593050d8530d446ce36cf084fa200458 (diff)
downloadeclipse.platform.debug-7907da8e73316345d971683cc5671026c313da1e.tar.gz
eclipse.platform.debug-7907da8e73316345d971683cc5671026c313da1e.tar.xz
eclipse.platform.debug-7907da8e73316345d971683cc5671026c313da1e.zip
Bug 32205 - [console] Add launch option to merge process outputI20190703-0640
Also make use of output merge option in external tool launch. Change-Id: Ibc3cec8df076a4cea3f83e37fa2640115dd3f49b Signed-off-by: Paul Pazderski <paul-eclipse@ppazderski.de>
Diffstat (limited to 'org.eclipse.debug.ui/ui/org/eclipse/debug/internal')
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java1
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties1
2 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
index 3588aa74a..d2ed415e3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
@@ -46,6 +46,7 @@ public class LaunchConfigurationsMessages extends NLS {
public static String CommonTab_19;
public static String CommonTab_2;
public static String CommonTab_20;
+ public static String CommonTab_21;
public static String CommonTab_3;
public static String CommonTab_4;
public static String CommonTab_5;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
index 7a3a36dfb..f042a9e5c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
@@ -39,6 +39,7 @@ CommonTab_18=Select a resource to redirect input from:
CommonTab_19=File System...
CommonTab_2=Defa&ult - inherited ({0})
CommonTab_20=Variables...
+CommonTab_21=&Merge standard and error output (disables coloring of error output)
CommonTab_3=Oth&er
CommonTab_4=Standard Input and Output
CommonTab_5=&Allocate console (necessary for input)

Back to the top