Robin Rosenberg 1a9f122773 Fix a number of failing conflict situations ... Adds further tests where the working tree is dirty (differs from index) and where we have staged but uncommitted changes. Fixed the test case 9 for file/directory conflicts. Bug: 428819 Change-Id: Ie44a288b052abe936ebb74272d0fefef3b218a7a Signed-off-by: Axel Richard <axel.richard@obeo.fr> Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>		2014-05-17 19:06:07 +02:00
..
.settings	Disable warning about assigning to parameter	2013-06-15 15:11:54 +02:00
META-INF	Fix a number of failing conflict situations	2014-05-17 19:06:07 +02:00
src/org/eclipse/jgit	Command line: implement checkout -- <path>	2014-05-12 17:12:48 -04:00
tst/org/eclipse/jgit/pgm	Fix a number of failing conflict situations	2014-05-17 19:06:07 +02:00
.classpath	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
.gitignore	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
.project	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
about.html	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
build.properties	Add missing resources from source.. in build.properties	2013-10-30 17:42:38 +01:00
org.eclipse.jgit.pgm--All-Tests (Java7).launch	Add the other test launchers as favorites	2013-06-16 23:33:29 +02:00
org.eclipse.jgit.pgm--All-Tests (Java8).launch	Add launchers for running tests with Java 8	2014-03-29 20:07:10 +01:00
org.eclipse.jgit.pgm--All-Tests.launch	Add the other test launchers as favorites	2013-06-16 23:33:29 +02:00
plugin.properties	Fix plugin provider names to conform with release train requirement	2013-04-08 23:05:36 +02:00
pom.xml	Prepare 3.4.0-SNAPSHOT builds	2014-05-06 00:04:09 +02:00