projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] Unify Makefile indentation
[git.git]
/
merge-cache.c
diff --git
a/merge-cache.c
b/merge-cache.c
index
b2893e6
..
744681b
100644
(file)
--- 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;
}