diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2010-10-27 22:12:46 +0200 |
|---|---|---|
| committer | Christian Halstrick <christian.halstrick@sap.com> | 2010-10-28 21:41:42 +0200 |
| commit | beeb1f6d08a907493b3660837fd4059322ca969a (patch) | |
| tree | ae97b1a2d79e7b3365d6154d5dec3eda3c00d2bd /org.eclipse.jgit/src/org/eclipse/jgit/lib/AbbreviatedObjectId.java | |
| parent | 07cae6e6c1d6982cf6b919e90e79330793c74a15 (diff) | |
| download | jgit-beeb1f6d08a907493b3660837fd4059322ca969a.tar.gz jgit-beeb1f6d08a907493b3660837fd4059322ca969a.zip | |
Fix Severe Bug in Merge Algorithm
As described in Bug 328551 there was a bug that the merge algorithm
was not always reporting conflicts when the same line was deleted
and modified. This problem was introduced during commit
0c017188b4d41cc80c297e35097095026734b3d4 when reported conflicts have
been checked for common pre- and suffixes.
This was fixed here by better determining whether after stripping
off common prefixes and suffixes from a conflicting region there
is still some conflicting part left.
I also added a unit test to test this situation.
Bug: 328551
Change-Id: Iec6c9055d00e5049938484a27ab98dda2577afc4
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/lib/AbbreviatedObjectId.java')
0 files changed, 0 insertions, 0 deletions