Christian Halstrick 0e815fe8c5 Fixed ResolveMerger regarding handling of deletions ... There was a bug in ResolveMerger which is one reason for bug 328841. If a merge was failing because of conflicts deletions where not handled correctly. Files which have to be deleted (because there was a non-conflicting deletion coming in from THEIRS) are not deleted. In the non-conflicting case we also forgot to delete the file but in this case we explicitly checkout in the end these files get deleted during that checkout. This is fixed by handling incoming deletions explicitly. Bug: 328841 Change-Id: I7f4c94ab54138e1b2f3fcdf34fb803d68e209ad0 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>		2010-11-07 14:59:01 +01:00
..
.settings	Run formatter on edited lines via save action	2010-08-26 12:33:09 -05:00
META-INF	Qualify builds as 0.10.0	2010-09-16 17:26:53 -07:00
exttst/org/eclipse/jgit	Rename getOldName,getNewName to getOldPath,getNewPath	2010-08-04 11:00:07 -07:00
tst/org/eclipse/jgit	Fixed ResolveMerger regarding handling of deletions	2010-11-07 14:59:01 +01:00
tst-rsrc/org/eclipse/jgit	Extend DirCache test case to check "intent to add" flag.	2010-08-31 21:57:10 +02: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 builds as 0.10.0	2010-09-16 17:26:53 -07:00