Mathieu Cartaud f7e233e450 Support -merge attribute in binary macro ... The merger is now able to react to the use of the merge attribute. The value unset and the custom value 'binary' are handled (-merge and merge=binary) Since the specification of the merge attribute states that when the attribute is unset, ours version must be kept in case of a conflict, we don't overwrite the file but keep the local version. Bug: 517128 Change-Id: Ib5fbf17bdaf727bc5d0e106ce88f2620d9f87a6f Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>		2017-06-27 10:33:50 +02:00
..
.api_filters	Support -merge attribute in binary macro	2017-06-27 10:33:50 +02: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	Harmonize the JDT settings within JGit	2012-11-16 10:25:45 -08: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	Enforce the use of Java5 API:s only (with a few exceptions)	2011-12-16 01:01:36 +01:00
org.eclipse.pde.core.prefs	Adding PDE API Tools nature to JGit	2010-01-16 10:00:30 -06:00