Merge origin/master

Conflicts:
	src/main/java/com/github/difflib/algorithm/jgit/JGitDiff.java
	src/test/java/com/github/difflib/algorithm/jgit/JGitDiffTest.java
	src/test/java/com/github/difflib/algorithm/jgit/LRJGitDiffTest.java

Author: wumpz

src/main/java/com/github/difflib/text/DiffRowGenerator.java

@@ -49,6 +49,9 @@
  */
 public class DiffRowGenerator {
 
+    public static final BiPredicate<String,String> IGNORE_WHITESPACE_EQUALIZER = (original, revised) 
+            -> original.trim().replaceAll("\\s+", " ").equals(revised.trim().replaceAll("\\s+", " "));
+    public static final BiPredicate<String,String> DEFAULT_EQUALIZER = Object::equals;
     private static final Pattern SPLIT_PATTERN = Pattern.compile("\\s+|[,.\\[\\](){}/\\\\*+\\-#]");
     private final boolean showInlineDiffs;
     private final boolean ignoreWhiteSpaces;
@@ -171,10 +174,6 @@ public Builder inlineDiffByWord(boolean inlineDiffByWord) {
     public static Builder create() {
         return new Builder();
     }
-
-    public static final BiPredicate<String,String> IGNORE_WHITESPACE_EQUALIZER = (original, revised) 
-            -> original.trim().replaceAll("\\s+", " ").equals(revised.trim().replaceAll("\\s+", " "));
-    public static final BiPredicate<String,String> DEFAULT_EQUALIZER = Object::equals;
 
     private DiffRowGenerator(Builder builder) {
         showInlineDiffs = builder.showInlineDiffs;

src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java

@@ -34,25 +34,6 @@
  */
 public class MyersDiffTest {
 
-    public MyersDiffTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
     @Test
     public void testDiffMyersExample1Forward() throws DiffException {
         List<String> original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");