Simple merge tool which lets you select diff types to merge.
Pass specific lines to merge, additionally to selected modes.
Added new side-by-side with form renderer for submitting into Merge.
Fixed and improved line-wise merging.
Let README contain merging info.
Fix line based merging.
Enhance form-sidebyside.
Merge branch 'master' of https://github.com/cobrafast/php-diff
Move use checkboxes all the way to the right.
Unified use-checkbox for insert-replace blocks.
Add example style for side-by-side render.
Update side-by-side style.
Fix merge not copying remaining lines at the end of the file.
Fix deprecated call for php 5.5
Fix php5.5 implementation
Add option to use custom head for side by side diffs
Squashed commit of the following:

commit 98372077171b20086dec81965e4df9ead8c031ab
Author: hackjan <hackjan@gmail.com>
Date:   Mon Dec 23 16:37:04 2013 +0800

    bug fix

    bug fix
Merge branch 'master' of https://github.com/cobrafast/php-diff

Conflicts:
	README.md
Merge branch 'master' of https://github.com/sayakb/php-diff

Conflicts:
	lib/Diff/Renderer/Html/Array.php
Copmposer update