diff options
| -rw-r--r-- | merge-cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-cache.c b/merge-cache.c index b2893e6e2d..744681b24f 100644 --- a/merge-cache.c +++ b/merge-cache.c @@ -30,7 +30,7 @@ static void run_program(void) if (one_shot) { err++; } else { - if (quiet) + if (!quiet) die("merge program failed"); exit(1); } @@ -129,7 +129,7 @@ int main(int argc, char **argv) } merge_file(arg); } - if (err && quiet) + if (err && !quiet) die("merge program failed"); return err; } |