Merge pull request #4 from ihor-sviziev/master

Allow to merge composer.lock files in sub-directory

Author: balbuf

merge.php

@@ -14,7 +14,7 @@
 // length for conflict marker (<<<)
 $markerLen = $argv[4];
 // are we working with the lock file?
-$isLock = strtolower($argv[5]) === 'composer.lock';
+$isLock = basename(strtolower($argv[5])) === 'composer.lock';
 // indentation type to use
 $indentation = $defaultIndentation = '    ';