Lines Matching refs:conflictedChangeLogs
330 my @conflictedChangeLogs;
333 push @conflictedChangeLogs, $1 if $line =~ m/^C\s+(.+?)[\r\n]*$/;
337 if (@conflictedChangeLogs) {
340 open RESOLVE, "-|", $resolveChangeLogsPath, "--no-warnings", @conflictedChangeLogs
