Christian Halstrick 153283f05a Added Merge command to the CLI ... This merge command accepts the merge strategy as option and uses the resolve strategy as default. It expects exactly one other revision which is merged with current head. Change-Id: Ia8c188b93ade4afabe6a9ccf267faf045f359a3a Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>		2011-03-29 12:27:45 -05:00
..
.settings	Run formatter on edited lines via save action	2010-08-26 12:33:09 -05:00
META-INF	Added Merge command to the CLI	2011-03-29 12:27:45 -05:00
resources/org/eclipse/jgit/pgm	Added Merge command to the CLI	2011-03-29 12:27:45 -05:00
src/org/eclipse/jgit/pgm	Added Merge command to the CLI	2011-03-29 12:27:45 -05: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	Revert "Hide Maven target directories from Eclipse"	2010-08-28 09:50:50 +02:00
build.properties	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	2010-01-10 15:59:03 +01:00
jgit.sh	Refactor our Maven build to be modular	2009-11-02 17:53:58 -08:00
plugin.properties	Correct bundle, provider names to be consistent	2010-01-23 11:42:15 -08:00
pom.xml	Qualify post 0.11 builds	2011-02-12 03:30:05 +01:00