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 <[EMAIL PROTECTED]>

---
commit 1d86b5cb68dd47b4fced8343945c8860946df5d2
tree 25c4f9cabd6db8c92ab1b0313093d898c03b2b7a
parent 04c23173a8120f3bd2ae8af545e7e4f62c505ef0
author Petr Baudis <[EMAIL PROTECTED]> Sat, 30 Jul 2005 13:07:03 +0200
committer Petr Baudis <[EMAIL PROTECTED]> Sat, 30 Jul 2005 13:07:03 +0200

 merge-cache.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/merge-cache.c b/merge-cache.c
--- 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;
 }
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to