Christian Halstrick 74d279fbf0 Teach NameConflictTreeWalk to report DF conflicts ... Add a method isDirectoryFileConflict() to NameConflictTreeWalk which tells whether the current path is part of a directory/file conflict. Change-Id: Iffcc7090aaec743dd6f3fd1a333cac96c587ae5d Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>		2010-07-28 17:26:31 +02:00
..
.settings	Fix line endings	2010-06-18 23:36:18 +02:00
META-INF	Merge branch 'delta'	2010-07-22 14:56:34 -07:00
exttst/org/eclipse/jgit	Rename Repository getWorkDir to getWorkTree	2010-06-25 18:03:41 -07:00
tst/org/eclipse/jgit	Teach NameConflictTreeWalk to report DF conflicts	2010-07-28 17:26:31 +02:00
tst-rsrc/org/eclipse/jgit	Move ignore node handling into WorkingTreeIterator	2010-07-21 10:34:08 -07: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	Start 0.9 development	2010-06-14 08:11:27 -07:00