Christian Halstrick 289b7c60a9 Fixed message for exception thrown during recursive merge ... During recursive merge jgit potentially has to merge multiple common ancestors. If this fails because there are conflicts then the exception thrown for that should have a message which states this clearly. Previously a wrong message was given ("More than 200 merge bases ...") Change-Id: Ia3c058d5575decdefd50390ed83b63668d31c1d1		2014-07-28 14:43:22 +02:00
..
.settings	Don't warn for methods that can be static	2014-07-02 00:36:38 +02:00
META-INF	Prepare 3.4.2-SNAPSHOT builds	2014-06-21 00:57:43 +02:00
findBugs	[findBugs] Silence warning about Transport initialization	2012-09-14 00:01:47 +02:00
resources/org/eclipse/jgit	Fixed message for exception thrown during recursive merge	2014-07-28 14:43:22 +02:00
src/org/eclipse/jgit	Fixed message for exception thrown during recursive merge	2014-07-28 14:43:22 +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	Prepare 3.4.2-SNAPSHOT builds	2014-06-21 00:57:43 +02:00