HomeSort by relevance Sort by last modified time
    Searched refs:conflictedChangeLogs (Results 1 - 2 of 2) sorted by null

  /external/webkit/WebKitTools/Scripts/
update-webkit 98 my @conflictedChangeLogs;
104 push @conflictedChangeLogs, $filename if basename($filename) eq "ChangeLog";
109 if (@conflictedChangeLogs) {
112 (system($resolveChangeLogsPath, "--no-warnings", @conflictedChangeLogs) == 0)
prepare-ChangeLog 330 my @conflictedChangeLogs;
333 push @conflictedChangeLogs, $1 if $line =~ m/^C\s+(.+?)[\r\n]*$/;
337 if (@conflictedChangeLogs) {
340 open RESOLVE, "-|", $resolveChangeLogsPath, "--no-warnings", @conflictedChangeLogs
    [all...]

Completed in 4026 milliseconds