Matthias Sohn aa7be667bc Make recursive merge strategy the default merge strategy ... Use recursive merge as the default strategy since it can successfully merge more cases than the resolve strategy can. This is also the default in native Git. Change-Id: I38fd522edb2791f15d83e99038185edb09fed8e1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		2013-04-15 21:46:12 +02:00
..
.settings	Harmonize the JDT settings within JGit	2012-11-16 10:25:45 -08:00
META-INF	Grant access to jgit internals to junit and http.server bundles	2013-03-22 21:35:16 +01:00
findBugs	[findBugs] Silence warning about Transport initialization	2012-09-14 00:01:47 +02:00
resources/org/eclipse/jgit/internal	Allow to get repo statistics from GarbageCollectionCommand before gc	2013-03-20 00:46:27 +01:00
src/org/eclipse/jgit	Make recursive merge strategy the default merge strategy	2013-04-15 21:46:12 +02:00
.classpath	Externalize strings from JGit	2010-05-19 14:37:16 -07:00
.fbprefs	Initial JGit contribution to eclipse.org	2009-09-29 16:47:03 -07:00
.gitignore	Finish removing Apache Felix maven-bundle-plugin	2010-01-12 11:46:55 -08:00
.project	Revert "Hide Maven target directories from Eclipse"	2010-08-28 09:50:50 +02:00
about.html	Add missing about.html files to all shipped bundles	2011-06-08 21:51:51 +02:00
build.properties	Add "resources/" as a source folder	2010-06-05 14:39:27 +02:00
plugin.properties	Remove incubation marker	2011-05-31 22:53:53 +02:00
pom.xml	JGit 3.0: move internal classes into an internal subpackage	2013-03-18 09:30:43 -07:00