Bernard Leach 98b019f4bd Implemented merge for parallel delete/modification ... Duplicates cgit behaviour for merging the case where OURS is deleted and THEIRS is modified as well as OURS is modified and THEIRS id deleted. Change-Id: Ia2ab4f8dc95020f2914ff01c2bf3b1bc62a9d45d Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>		2011-05-03 12:11:52 -05:00
..
.settings	Run formatter on edited lines via save action	2010-08-26 12:33:09 -05:00
META-INF	Qualify post-0.12 builds	2011-05-03 00:19:54 +02:00
exttst/org/eclipse/jgit	Remove deprecated Repository.mapTree	2011-03-07 12:36:51 -08:00
tst/org/eclipse/jgit	Implemented merge for parallel delete/modification	2011-05-03 12:11:52 -05: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	Correct bundle, provider names to be consistent	2010-01-23 11:42:15 -08:00
pom.xml	Qualify post-0.12 builds	2011-05-03 00:19:54 +02:00