Christian Halstrick 47f4171315 Let Resolve be the default Merge strategy ... the merge command should use by default the "resolve" merge strategy. Change-Id: I6c6973a3397cca12bd8a6bd950d04b1766a08b4c Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>		2010-08-31 01:29:49 +02:00
..
.settings	Run formatter on edited lines via save action	2010-08-26 12:33:09 -05:00
META-INF	Merge branch 'delta'	2010-07-22 14:56:34 -07:00
findBugs	Initial JGit contribution to eclipse.org	2009-09-29 16:47:03 -07:00
resources/org/eclipse/jgit	Improve LargeObjectException reporting	2010-08-30 11:53:25 -07:00
src/org/eclipse/jgit	Let Resolve be the default Merge strategy	2010-08-31 01:29:49 +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	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	Start 0.9 development	2010-06-14 08:11:27 -07:00