Commit 3831ed1e authored by Daniel P. Berrange's avatar Daniel P. Berrange

Merge stderr/out

parent ddcefb20
......@@ -48,7 +48,7 @@ if (-f "$conf.cfg") {
}
}
my @newargv = ("-r", "--norc", $testdir);
my @newargv = ("-r", "--norc", "--merge", $testdir);
if ($archive) {
push @newargv, "-a", $archive;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment