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	Revert "Add getPackFile to ReceivePack to make PostReceiveHook more	2014-03-02 01:52:04 +01:00
META-INF	Fix manifests of source bundles	2014-05-07 11:32:42 +02:00
findBugs	[findBugs] Silence warning about Transport initialization	2012-09-14 00:01:47 +02:00
resources/org/eclipse/jgit	Handle repo copyfile in bare repositories.	2014-05-09 17:25:50 -07:00
src/org/eclipse/jgit	Fix a number of failing conflict situations	2014-05-17 19:06:07 +02:00
.classpath	Externalize strings from JGit	2010-05-19 14:37:16 -07:00
.fbprefs	Initial JGit contribution to eclipse.org	2009-09-29 16:47:03 -07: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
about.html	Add missing about.html files to all shipped bundles	2011-06-08 21:51:51 +02:00
build.properties	Add "resources/" as a source folder	2010-06-05 14:39:27 +02:00
plugin.properties	Remove incubation marker	2011-05-31 22:53:53 +02:00
pom.xml	Prepare 3.4.0-SNAPSHOT builds	2014-05-06 00:04:09 +02:00