KB Sriram 4a985f5aa8 Make diff locations more consistent ... DiffAlgorithms can return different edit locations for inserts or deletes, if they can be "shifted" up or down repeating blocks of lines. This causes the 3-way merge to apply both edits, resulting in incorrectly removing or duplicating lines. Augment an existing "tidy-up" stage in DiffAlgorithm to move all shiftable edits (not just the last INSERT edit) to a consistent location, and add test cases for previously incorrect merges. Bug: 514095 Change-Id: I5fe150a2fc04e1cdb012d22609d86df16dfb0b7e Signed-off-by: KB Sriram <kbsriram@google.com>		2017-04-03 16:45:13 -07:00
..
AbstractDiffTestCase.java	Make diff locations more consistent	2017-04-03 16:45:13 -07:00
DiffEntryTest.java	Enable and fix 'Should be tagged with @Override' warning	2017-02-19 20:05:08 -04:00
DiffFormatterReflowTest.java	Convert all JGit unit tests to JUnit 4	2010-12-31 14:00:05 -08:00
DiffFormatterTest.java	Enable and fix warnings about redundant specification of type arguments	2017-02-20 22:47:23 +01:00
EditListTest.java	cleanup: Prefer assertEquals over assertTrue(....equals(...))	2012-09-03 22:37:57 +02:00
EditTest.java	cleanup: Prefer assertEquals over assertTrue(....equals(...))	2012-09-03 22:37:57 +02:00
HistogramDiffTest.java	Convert all JGit unit tests to JUnit 4	2010-12-31 14:00:05 -08:00
MyersDiffTest.java	Delete DiffPerformanceTest	2010-11-01 14:09:51 -07:00
PatchIdDiffFormatterTest.java	PatchIdDiffFormatterTest: Open Git and PatchIdDiffFormatter in try-with-resource	2016-02-12 14:07:53 +09:00
RawTextIgnoreAllWhitespaceTest.java	Convert all JGit unit tests to JUnit 4	2010-12-31 14:00:05 -08:00
RawTextIgnoreLeadingWhitespaceTest.java	Convert all JGit unit tests to JUnit 4	2010-12-31 14:00:05 -08:00
RawTextIgnoreTrailingWhitespaceTest.java	Convert all JGit unit tests to JUnit 4	2010-12-31 14:00:05 -08:00
RawTextIgnoreWhitespaceChangeTest.java	Convert all JGit unit tests to JUnit 4	2010-12-31 14:00:05 -08:00
RawTextTest.java	Fix RawText.getLineDelimiter() for empty first line	2015-01-17 23:28:20 +01:00
RenameDetectorTest.java	Enable and fix warnings about redundant specification of type arguments	2017-02-20 22:47:23 +01:00
SimilarityIndexTest.java	Rename detection should canonicalize line endings	2015-01-02 23:23:22 +01:00