Skip to content

Commit c1474e8

Browse files
authored
Allow to merge composer.lock files in sub-directory
composer.json and composer.lock files might be located not in the project root
1 parent 3312d8a commit c1474e8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

merge.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// length for conflict marker (<<<)
1515
$markerLen = $argv[4];
1616
// are we working with the lock file?
17-
$isLock = strtolower($argv[5]) === 'composer.lock';
17+
$isLock = basename(strtolower($argv[5])) === 'composer.lock';
1818
// indentation type to use
1919
$indentation = $defaultIndentation = ' ';
2020

0 commit comments

Comments
 (0)