Denys Digtiar c580c56c4d Fix ClassCastException in MergeCommand ... Test was added which reproduce the ClassCastException when ours or theirs merge strategy is set to MergeCommand. Merger and MergeCommand were updated in order to avoid exception. Change-Id: I4c1284b4e80d82638d0677a05e5d38182526d196 Signed-off-by: Denys Digtiar <duemir@gmail.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>		2011-08-21 13:53:02 -07:00
..
.settings	Run formatter on edited lines via save action	2010-08-26 12:33:09 -05:00
META-INF	Fix ClassCastException in MergeCommand	2011-08-21 13:53:02 -07:00
exttst/org/eclipse/jgit	Remove deprecated Repository.mapTree	2011-03-07 12:36:51 -08:00
tst/org/eclipse/jgit	Fix ClassCastException in MergeCommand	2011-08-21 13:53:02 -07:00
tst-rsrc/org/eclipse/jgit	Fix TestTranslationBundle	2010-12-31 14:01:34 -08: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	Revert "Hide Maven target directories from Eclipse"	2010-08-28 09:50:50 +02: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 1.1.0 builds	2011-06-06 01:24:32 +02:00