Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2019-09-25 04:46:17 +0000
committerEd Merks2019-09-25 10:21:57 +0000
commita9d35b32a663fa8ca3629b31ce1b6d346196b22e (patch)
treeceee25b0dd20c27edec5443b8885e3fa75351c37 /examples/org.eclipse.compare.examples
parent9569b75535b8052a007ed309eee4b2053dc8861c (diff)
downloadeclipse.platform.team-a9d35b32a663fa8ca3629b31ce1b6d346196b22e.tar.gz
eclipse.platform.team-a9d35b32a663fa8ca3629b31ce1b6d346196b22e.tar.xz
eclipse.platform.team-a9d35b32a663fa8ca3629b31ce1b6d346196b22e.zip
Bug 551438 - Fix files that have ended up with CRLF in the git
repository Fix PatchBuilderTest to adjust expectations based on the line delimiter of the input file. Fix PatchUITest so that it passes on Windows when the expected input is already using CRLF. Change-Id: I6a397114f410feceb5791644591b76cd2e0bb11b Signed-off-by: Ed Merks <ed.merks@gmail.com>
Diffstat (limited to 'examples/org.eclipse.compare.examples')
-rw-r--r--examples/org.eclipse.compare.examples/.settings/org.eclipse.core.runtime.prefs4
-rw-r--r--examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF2
-rw-r--r--examples/org.eclipse.compare.examples/pom.xml2
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/org.eclipse.compare.examples/.settings/org.eclipse.core.runtime.prefs b/examples/org.eclipse.compare.examples/.settings/org.eclipse.core.runtime.prefs
index c522e1f4a..5a0ad22d2 100644
--- a/examples/org.eclipse.compare.examples/.settings/org.eclipse.core.runtime.prefs
+++ b/examples/org.eclipse.compare.examples/.settings/org.eclipse.core.runtime.prefs
@@ -1,2 +1,2 @@
-eclipse.preferences.version=1
-line.separator=\n
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
index 3f05cedf7..7ed7d3df0 100644
--- a/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare.examples; singleton:=true
-Bundle-Version: 3.2.300.qualifier
+Bundle-Version: 3.2.400.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.compare.examples.structurecreator
diff --git a/examples/org.eclipse.compare.examples/pom.xml b/examples/org.eclipse.compare.examples/pom.xml
index 74cfb8568..210cbab0a 100644
--- a/examples/org.eclipse.compare.examples/pom.xml
+++ b/examples/org.eclipse.compare.examples/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.compare</groupId>
<artifactId>org.eclipse.compare.examples</artifactId>
- <version>3.2.300-SNAPSHOT</version>
+ <version>3.2.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>

Back to the top