]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 049827d) | patch
Change default diff algorithm to histogram and add tests 58/1958/2
authorChristian Halstrick <christian.halstrick@sap.com>
Thu, 25 Nov 2010 23:44:05 +0000 (00:44 +0100)
committerChristian Halstrick <christian.halstrick@sap.com>
Thu, 25 Nov 2010 23:44:05 +0000 (00:44 +0100)
commit12a5c8d413baab3f27932a7c850dbfc0407ded78
tree3510973a7686249a33b1e044b8cb5a28970a5532tree | snapshot
parent049827d7080201fe24f2728b26d681434327f72acommit | diff
Change default diff algorithm to histogram and add tests

The referenced bug showed that JGit produced different merge results
compared to C Git. Unit test was added to reproduce the issue. The
problem can be solved by switching to histogram diff algorithm.

Bug: 331078
Change-Id: I54f30afb3a9fef1dbca365ca5f98f4cc846092e3
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Philipp Thun <philipp.thun@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit