Christian Halstrick 1196dd0643 Fix ResolveMerger when files should be replaced by folders ... When during Merge for a certain path OURS & BASE contains a file and THEIRS contains a folder there was a bug in JGit leading to unnecessary conflicts. This commit fixes it and adds a test for this situation. Bug: 472693 Change-Id: I71fac5a6a2ef926c01adc266c6f9b3275e870129 Also-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		2015-07-23 11:21:53 +02:00
..
.settings	Set minimum required Java version to Java 7	2015-02-09 14:11:50 +01:00
META-INF	Prepare 4.0.2-SNAPSHOT builds	2015-06-24 13:51:21 +02:00
exttst/org/eclipse/jgit/patch	Deprecate TemporaryBuffer.LocalFile without parent directory	2014-11-25 10:21:48 -08:00
src/org/eclipse/jgit/lib	Expose Sets helper to tests outside org.eclipse.jgit.api	2015-05-21 16:15:06 -07:00
tst/org/eclipse/jgit	Fix ResolveMerger when files should be replaced by folders	2015-07-23 11:21:53 +02:00
tst-rsrc	Fix patch application WRT windows line endings.	2013-01-19 13:29:02 +01:00
.classpath	Add "src" folder to source folders of org.eclipse.jgit.test	2015-05-29 04:19:25 -04:00
.gitignore	Extend the FS class for Java7	2013-05-04 02:01:56 +02:00
.project	Extend the FS class for Java7	2013-05-04 02:01:56 +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 (Java 7).launch	Extend the FS class for Java7	2013-05-04 02:01:56 +02:00
org.eclipse.jgit.core--All-Tests (Java 8).launch	Add launchers for running tests with Java 8	2014-03-29 20:07:10 +01:00
org.eclipse.jgit.core--All-Tests.launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
plugin.properties	Fix plugin provider names to conform with release train requirement	2013-04-08 23:05:36 +02:00
pom.xml	Prepare 4.0.2-SNAPSHOT builds	2015-06-24 13:51:21 +02:00