Home | History | Annotate | Download | only in Scripts

Lines Matching refs:fileMine

172     my $fileMine;
189         $fileMine = "${file}.mine" if -e "${file}.mine";
222                 $fileMine = "${file}.REMOTE.$$";
223                 $outputFile = $fileMine;
235     if (!$fileMine && !$fileOlder && !$fileNewer) {
237     } elsif (!$fileMine || !$fileOlder || !$fileNewer) {
241     return ($fileMine, $fileOlder, $fileNewer);
440     my ($fileMine, $fileOlder, $fileNewer) = conflictFiles($file);
442     return unless $fileMine && $fileOlder && $fileNewer;
444     if (mergeChangeLogs($fileMine, $fileOlder, $fileNewer)) {
449         unlink($fileMine, $fileOlder);
455         unlink($fileMine, $fileOlder, $fileNewer) if $isGit;