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
..
.api_filters	Honor CRLF settings when writing merge results	2018-02-02 00:45:32 +01:00
org.eclipse.core.resources.prefs	Initial JGit contribution to eclipse.org	2009-09-29 16:47:03 -07:00
org.eclipse.core.runtime.prefs	Fix line endings	2010-06-18 23:36:18 +02:00
org.eclipse.jdt.core.prefs	Enable and fix warnings about redundant specification of type arguments	2017-02-20 22:47:23 +01:00
org.eclipse.jdt.ui.prefs	Partially revert c0ad77d8 "Enhance Eclipse save actions"	2017-08-30 03:07:18 +02:00
org.eclipse.mylyn.tasks.ui.prefs	Use commit message best practices for Mylyn Commit template	2011-09-05 23:57:21 +02:00
org.eclipse.mylyn.team.ui.prefs	Use commit message best practices for Mylyn Commit template	2011-09-05 23:57:21 +02:00
org.eclipse.pde.api.tools.prefs	Ignore warning for minor version change without API change	2017-11-24 01:12:14 +01:00
org.eclipse.pde.core.prefs	Adding PDE API Tools nature to JGit	2010-01-16 10:00:30 -06:00