Merge master into unified-diff-parser

wumpz · wumpz · commit de227395cd6f · 2019-06-10T00:41:27.000+02:00
Conflicts:
	README.md
	pom.xml
diff --git a/src/main/java/com/github/difflib/unifieddiff/package-info.java b/src/main/java/com/github/difflib/unifieddiff/package-info.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /**
- * This is the fiest test version of a multifile diff parser. The Api is still subject
+ * This is the first test version of a multifile diff parser. The Api is still subject
  * of change.
  */
 package com.github.difflib.unifieddiff;
