I'm totally stupid and got it backwards, sorry about that.
git-merge-cache -q would mean it's noisy and quiet without any
parameters.
Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
if (one_shot) {
err++;
} else {
if (one_shot) {
err++;
} else {
die("merge program failed");
exit(1);
}
die("merge program failed");
exit(1);
}
die("merge program failed");
return err;
}
die("merge program failed");
return err;
}