Added two options to correct file paths if they differ in the merged files#30

LexxFedoroff wants to merge 1 commit intoNimut:mainNimut/phpunit-merger:mainfrom

LexxFedoroff:mainLexxFedoroff/phpunit-merger:mainCopy head branch name to clipboard