Fix line based merging.
Enhance form-sidebyside.
Merge branch 'master' of https://github.com/cobrafast/php-diff