Stefan Lay 5b0e73b849 Add a merge command to the jgit API ... Merges the current head with one other commit. In this first iteration the merge command supports only fast forward and already up-to-date. Change-Id: I0db480f061e01b343570cf7da02cac13a0cbdf8f Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>		2010-05-24 09:52:28 -05:00
..
.settings	Fix code formatter style references	2010-01-05 11:47:49 -08:00
META-INF	Externalize strings from JGit	2010-05-19 14:37:16 -07:00
exttst/org/eclipse/jgit	Refactor TemporaryBuffer to support reuse in other contexts	2010-01-12 11:56:55 -08:00
tst/org/eclipse/jgit	Add a merge command to the jgit API	2010-05-24 09:52:28 -05:00
tst-rsrc/org/eclipse/jgit	Correctly skip over unrecognized optional dircache extensions	2010-02-02 09:09:26 -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	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	2010-01-10 15:59:03 +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	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.launch	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	2010-01-10 15:59:03 +01:00
org.eclipse.jgit.core--All-Tests (Java 6).launch	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	2010-01-10 15:59:03 +01:00
org.eclipse.jgit.core--All-Tests.launch	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	2010-01-10 15:59:03 +01:00
plugin.properties	Correct bundle, provider names to be consistent	2010-01-23 11:42:15 -08:00
pom.xml	Test root locale translations	2010-05-19 14:37:33 -07:00