Christian Halstrick 049827d708 Make diff algorithm configurable ... The diff algorithm which is used by Merge, Cherry-Pick, Rebase should be configurable. A new configuration parameter "diff.algorithm" is introduced which currently accepts the values "myers" or "histogram". Based on this parameter for example the ResolveMerger will choose a diff algorithm. The reason for this is bug 331078. This bug shows that JGit is more compatible with C Git when histogram diff is in place. But since histogram diff is quite new we need an easy way to fall back to Myers diff. Bug: 331078 Change-Id: I2549c992e478d991c61c9508ad826d1a9e539ae3 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Philipp Thun <philipp.thun@sap.com>		2010-11-26 00:30:08 +01:00
..
.settings	Run formatter on edited lines via save action	2010-08-26 12:33:09 -05:00
META-INF	Implemented the git add commandline command.	2010-11-07 21:30:56 +01:00
resources/org/eclipse/jgit/pgm	Add the Checkout command to the Git CLI	2010-11-23 13:07:46 -06:00
src/org/eclipse/jgit/pgm	Make diff algorithm configurable	2010-11-26 00:30:08 +01: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 builds as 0.10.0	2010-09-16 17:26:53 -07:00