Stefan Lay 215a74eceb Add conflicts message before footer ... In case of a conflict during cherry-pick or revert the commit message was amended after the footer. This made the footer invalid. Many users do not understand that they have to edit the commit message in order to make it valid again. Change-Id: I7e7fae125129e2a0d8950510550acda766531835 Bug: 367416		2013-01-19 11:38:33 -05:00
..
.settings	Harmonize the JDT settings within JGit	2012-11-16 10:25:45 -08:00
META-INF	Delete the iplog generator, cont'd	2013-01-09 19:33:32 +01:00
exttst/org/eclipse/jgit/patch	Kill GitIndex	2011-11-09 09:16:50 +01:00
tst/org/eclipse/jgit	Add conflicts message before footer	2013-01-19 11:38:33 -05:00
tst-rsrc	Make ApplyCommand create missing parent directories for new files	2012-07-16 09:04:30 -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	Enforce the use of Java5 API:s only (with a few exceptions)	2011-12-16 01:01:36 +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	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
org.eclipse.jgit.core--All-External-Tests.launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
org.eclipse.jgit.core--All-Tests (Java 6).launch	Increase heap size for jgit tests	2010-08-27 00:29:31 +02:00
org.eclipse.jgit.core--All-Tests.launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
plugin.properties	Remove incubation marker	2011-05-31 22:53:53 +02:00
pom.xml	Delete the iplog generator	2013-01-09 14:21:40 +01:00