Matthias Sohn aa7be667bc Make recursive merge strategy the default merge strategy ... Use recursive merge as the default strategy since it can successfully merge more cases than the resolve strategy can. This is also the default in native Git. Change-Id: I38fd522edb2791f15d83e99038185edb09fed8e1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		2013-04-15 21:46:12 +02:00
..
.settings	Add the no-commit option to MergeCommand	2013-04-04 15:11:49 +02:00
META-INF	JGit 3.0: move internal classes into an internal subpackage	2013-03-18 09:30:43 -07:00
resources/org/eclipse/jgit/pgm	clean up merge squash and no-commit messages in pgm	2013-04-08 09:51:00 -04:00
src/org/eclipse/jgit/pgm	Make recursive merge strategy the default merge strategy	2013-04-15 21:46:12 +02:00
.classpath	Externalize strings from JGit	2010-05-19 14:37:16 -07: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
about.html	Add missing about.html files to all shipped bundles	2011-06-08 21:51:51 +02:00
build.properties	Add missing about.html files to all shipped bundles	2011-06-08 21:51:51 +02:00
jgit.sh	Force jgit.sh to use UTF-8 encoding on Mac	2011-12-07 00:44:46 +01:00
plugin.properties	Fix plugin provider names to conform with release train requirement	2013-04-08 23:05:36 +02:00
pom.xml	JGit 3.0: move internal classes into an internal subpackage	2013-03-18 09:30:43 -07:00