George C. Young ab99b78ca0 Implement recursive merge strategy ... Extend ResolveMerger with RecursiveMerger to merge two tips that have up to 200 bases. Bug: 380314 CQ: 6854 Change-Id: I6292bb7bda55c0242a448a94956f2d6a94fddbaa Also-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <zx@twitter.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		2013-02-22 23:51:50 +01:00
..
.settings	Harmonize the JDT settings within JGit	2012-11-16 10:25:45 -08:00
META-INF	Prepare 2.3.2-SNAPSHOT builds	2013-02-21 02:13:15 +01:00
exttst/org/eclipse/jgit/patch	Kill GitIndex	2011-11-09 09:16:50 +01:00
tst/org/eclipse/jgit	Implement recursive merge strategy	2013-02-22 23:51:50 +01:00
tst-rsrc	Fix patch application WRT windows line endings.	2013-01-19 13:29:02 +01:00
.classpath	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	2010-01-10 15:59:03 +01: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.properties	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	2010-01-10 15:59:03 +01:00
org.eclipse.jgit.core--All-External-Tests (Java 6).launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
org.eclipse.jgit.core--All-External-Tests.launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
org.eclipse.jgit.core--All-Tests (Java 6).launch	Increase heap size for jgit tests	2010-08-27 00:29:31 +02:00
org.eclipse.jgit.core--All-Tests.launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
plugin.properties	Remove incubation marker	2011-05-31 22:53:53 +02:00
pom.xml	Prepare 2.3.2-SNAPSHOT builds	2013-02-21 02:13:15 +01:00