X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=merge-cache.c;h=744681b24fc9a3690b5d10f50b62d5887b8ed7f3;hb=3e386508f87278610d1892aaaa08cd17907f71c5;hp=b2893e6e2d524542fa375d409a36623cb2f5478d;hpb=bbd14cb0113ca26d679970f4db9ad953fb273e36;p=git.git

diff --git a/merge-cache.c b/merge-cache.c
index b2893e6e..744681b2 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;
 }