fwrite( $yourtextFile, $yours ); fclose( $yourtextFile );
# Check for a conflict
- #$cmd = "{$wgDiff3} -a --overlap-only $mytextName $oldtextName $yourtextName";
$cmd = wfEscapeShellArg( $wgDiff3 ) . " -a --overlap-only " .
wfEscapeShellArg( $mytextName ) . " " .
wfEscapeShellArg( $oldtextName ) . " " .
pclose( $handle );
# Merge differences
- #$cmd = "{$wgDiff3} -a -e --merge $mytextName $oldtextName $yourtextName";
$cmd = wfEscapeShellArg( $wgDiff3 ) . " -a -e --merge " .
wfEscapeShellArg( $mytextName, $oldtextName, $yourtextName );
$handle = popen( $cmd, "r" );
$result .= $data;
} while ( true );
pclose( $handle );
- #unlink( $mytextName ); unlink( $oldtextName ); unlink( $yourtextName );
+ unlink( $mytextName ); unlink( $oldtextName ); unlink( $yourtextName );
return ! $conflict;
}