merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 6027ead5a9f60cf1986d0ad6aeb7dca9f776c9b5..4482f16efb66c7fc06c7446a2e992840cc83f798 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -55,6 +55,11 @@ static void print_helper_status(struct ref *ref)
                        msg = "needs force";
                        break;
 
+               case REF_STATUS_REJECT_STALE:
+                       res = "error";
+                       msg = "stale info";
+                       break;
+
                case REF_STATUS_REJECT_ALREADY_EXISTS:
                        res = "error";
                        msg = "already exists";
@@ -178,7 +183,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                        }
                        if (!prefixcmp(arg, "--" CAS_OPT_NAME "=")) {
                                if (parse_push_cas_option(&cas,
-                                                         strchr(arg, '=') + 1, 1) < 0)
+                                                         strchr(arg, '=') + 1, 0) < 0)
                                        exit(1);
                                continue;
                        }