Home | History | Annotate | Download | only in Scripts

Lines Matching refs:fileOlder

173     my $fileOlder;
206 $fileOlder = shift @matchingFiles;
216 $fileOlder = "${file}.BASE.$$";
217 $outputFile = $fileOlder;
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;