Thomas Wolf fc7d407d0b Honor CRLF settings when writing merge results ... Merges are performed using the raw text as stored in the git repository. When we write the merge result, we must apply the correct CRLF settings. Otherwise the line endings in the result will be wrong. Bug: 499615 Change-Id: I37a9b987e9404c97645d2720cd1c7c04c076a96b Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		2018-02-02 00:45:32 +01:00
..
.settings	Honor CRLF settings when writing merge results	2018-02-02 00:45:32 +01:00
META-INF	Prepare 4.11.0-SNAPSHOT builds	2017-12-31 04:05:07 +01:00
findBugs	…
resources/org/eclipse/jgit	Minor fixes in three error messages	2018-01-30 07:36:37 +01:00
src/org/eclipse/jgit	Honor CRLF settings when writing merge results	2018-02-02 00:45:32 +01:00
.classpath	Change JGit minimum execution environment to JavaSE-1.8	2016-09-20 11:32:36 +02:00
.fbprefs	…
.gitignore	…
.project	…
BUILD	Add com.jcraft.jzlib 1.1.1	2018-01-04 13:53:29 -05:00
about.html	SHA-1: collision detection support	2017-02-28 16:38:43 -08:00
build.properties	…
plugin.properties	…
pom.xml	Add com.jcraft.jzlib 1.1.1	2018-01-04 13:53:29 -05:00