Home | History | Annotate | Download | only in Scripts

Lines Matching refs:fileMine

1630 #   $fileMine:  The merged version of the file.  Also known in git as the
1644     my ($fileMine, $fileOlder, $fileNewer) = @_;
1646     my $traditionalReject = $fileMine =~ /\.rej$/ ? 1 : 0;
1652         open(DIFF, "<", $fileMine) or die $!;
1655         rename($fileMine, "$fileMine.save");
1658         open(DIFF, "-|", qw(diff -u -a --binary), $fileOlder, $fileMine) or die $!;
1689         rename("$fileMine.save", $fileMine);