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