Skip to content
This repository has been archived by the owner on Dec 9, 2024. It is now read-only.

Update ThreeWayMerge.php #6

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update ThreeWayMerge.php #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a75347
Update ThreeWayMerge.php
j13k Mar 6, 2019
1c6f661
Update .travis.yml
j13k Mar 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ php:
- 5.5
- 5.6
- 7.0
- 7.2
- hhvm

matrix:
Expand All @@ -16,7 +17,7 @@ before_install:
- composer selfupdate
- pear channel-discover pear.phing.info
- pear install phing/phing
- pear install pear/PHP_CodeSniffer
- pear install pear/PHP_CodeSniffer-2.9.1
- phpenv rehash

install:
Expand Down
2 changes: 1 addition & 1 deletion src/ThreeWayMerge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ protected function linesAddedOrModified(
// We will make sure they are same or throw exception.
for ($i = $count_ancestor; $i < $count; $i++) {
if ($count_ancestor == $count_remote) {
$merged[$i] == $local[$i];
$merged[$i] = $local[$i];
} elseif ($count_ancestor == $count_local) {
$merged[$i] = $remote[$i];
} elseif ($count_local == $count_remote) {
Expand Down