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
..
MANIFEST.MF	Fix a number of failing conflict situations	2014-05-17 19:06:07 +02:00