Remove xdiff code, xdiff does not treat conflicts well.

bircher · Mar 18, 2017 · daf81ee · daf81ee
1 parent c321b28
commit daf81ee
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 195 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,5 @@ php:
 
 before_script:
   - git --version
-  - pecl install xdiff
   - composer install --prefer-dist --dev
 
diff --git a/composer.json b/composer.json
@@ -1,8 +1,8 @@
 {
     "name": "bircher/php-merge",
     "type": "library",
-    "description": "A PHP merge utility using the Diff php library, the command line git or xdiff.",
-    "keywords": ["git", "merge", "xdiff"],
+    "description": "A PHP merge utility using the Diff php library or the command line git.",
+    "keywords": ["git", "merge"],
     "homepage": "https://github.com/bircher/php-merge",
     "license": "MIT",
     "authors": [

diff --git a/php-stub/xdiff-string-merge3.php b/php-stub/xdiff-string-merge3.php
diff --git a/src/PhpMerge/XdiffMerge.php b/src/PhpMerge/XdiffMerge.php
diff --git a/test/PhpMerge/Test/XdiffMergeTest.php b/test/PhpMerge/Test/XdiffMergeTest.php