ges-code/devtools/bin/splitdiff3.pl at develop · goldeneye-source/ges-code

This repository was archived by the owner on Nov 1, 2025. It is now read-only.

History

54 lines (49 loc) · 913 Bytes

Raw

$infilename = shift;

$outfilename1 = shift;

$outfilename2 = shift;

open INPUT, $infilename || die;

@input = <INPUT>;

close INPUT;

open MERGEDMINE, ">$outfilename1" || die;

open MERGEDTHEIRS, ">$outfilename2" || die;

for( $i = 0; $i & 5599 lt; scalar( @input ); $i++ )

{

$line = $input[$i];

if( $line =~ m/^(.*)<<<<<<</ )

{

$first = 1;

$second = 0;

print MERGEDMINE $1;

print MERGEDTHEIRS $1;

next;

}

# Make sure that we are in a split block so that comments with ======= don't mess us up.

if( $line =~ m/^(.*)=======$/ && $first == 1 )

{

$first = 0;

$second = 1;

print MERGEDMINE $1;

next;

}

if( $line =~ m/^(.*)>>>>>>>/ )

{

$first = $second = 0;

print MERGEDTHEIRS $1;

next;

}

if( $first )

{

print MERGEDMINE $line;

}

elsif( $second )

{

print MERGEDTHEIRS $line;

}

else

{

print MERGEDMINE $line;

print MERGEDTHEIRS $line;

}

close MERGEDMINE;

close MERGEDTHEIRS;

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FilesExpand file tree

splitdiff3.pl

Latest commit

History

splitdiff3.pl

File metadata and controls