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> |
преди 13 години | |
---|---|---|
.. | ||
CherryPickTest.java | Move commit and tag formatting to CommitBuilder, TagBuilder | преди 14 години |
MergeAlgorithmTest.java | Change default diff algorithm to histogram and add tests | преди 13 години |
MergeMessageFormatterTest.java | Format merge commit messages like C Git | преди 13 години |
SimpleMergeTest.java | Move commit and tag formatting to CommitBuilder, TagBuilder | преди 14 години |