Philipp Thun bf05108d0b Abort merge when file to be checked out is dirty ... In case a file needs to be checked out (from THEIRS) during a merge operation, it has to be checked if the worktree version of this file is dirty. If this is true, merge shall fail. Change-Id: I17c24845584700aad953c3d4f2bea77a0d665ec4 Signed-off-by: Philipp Thun <philipp.thun@sap.com>		2011-03-18 17:04:50 +01:00
..
.settings	Run formatter on edited lines via save action	2010-08-26 12:33:09 -05:00
META-INF	Fix Bundle-Version of jgit source bundle	2011-03-10 14:25:17 +01:00
findBugs	[findbugs] Do not ignore exceptional return value of mkdir	2011-01-28 01:11:12 +01:00
resources/org/eclipse/jgit	UploadPack: Report invalid want lines with ERR	2011-03-17 10:53:19 -07:00
src/org/eclipse/jgit	Abort merge when file to be checked out is dirty	2011-03-18 17:04:50 +01: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	Adding some Eclipse-related legal files to JGit	2010-02-03 15:18:06 -06:00
build.properties	Add "resources/" as a source folder	2010-06-05 14:39:27 +02:00
plugin.properties	Cleaning up provider and feature names	2010-04-27 09:26:25 -05:00
pom.xml	Fix formatting of pom.xml	2011-02-24 16:04:33 +01:00