bircher /
php-merge
| ⇢ | A | GitMerge::fixLastLine() added | |
| ⇢ | A | Line::getContent() added | |
| ⇢ | A | Line::getType() added | |
| ⇢ | A | PhpMergeBase::splitStringByLines() added | |
| A | ↛ | GitMerge::preMergeAlter() removed | |
| A | ↛ | GitMerge::postMergeAlter() removed |
