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	Ignore warning for minor version change without API change	2017-11-24 01:12:14 +01:00
META-INF	Prepare 4.11.0-SNAPSHOT builds	2017-12-31 04:05:07 +01:00
src/org/eclipse/jgit/junit	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
.gitignore	Finish removing Apache Felix maven-bundle-plugin	2010-01-12 11:46:55 -08:00
.project	Enforce the use of Java5 API:s only (with a few exceptions)	2011-12-16 01:01:36 +01:00
BUILD	Bazel: Restrict src globs to Java source files	2017-04-13 14:14:55 +09:00
build.properties	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	2010-01-10 15:59:03 +01:00
plugin.properties	Fix plugin provider names to conform with release train requirement	2013-04-08 23:05:36 +02:00
pom.xml	Prepare 4.11.0-SNAPSHOT builds	2017-12-31 04:05:07 +01:00