Merge branch 'maint'

* maint:
bisect: fix singular/plural grammar nit

diff --combined bisect.c
index f1a1f84aa04102378ffe37b8e5b617a6fffeb2fa,b779a9589aae28ed8e92ca64309fb62936480e9d..3d04d2a0bb1d3e2cc59d0747c838ba3f981a0b54
--- 1/bisect.c
--- 2/bisect.c
+++ b/bisect.c
@@@ -813,11 -813,11 +813,11 @@@ static void handle_skipped_merge_base(c
        char *bad_hex = sha1_to_hex(current_bad_sha1);
        char *good_hex = join_sha1_array_hex(&good_revs, ' ');
  
 -      fprintf(stderr, "Warning: the merge base between %s and [%s] "
 +      warning("the merge base between %s and [%s] "
                "must be skipped.\n"
                "So we cannot be sure the first bad commit is "
                "between %s and %s.\n"
 -              "We continue anyway.\n",
 +              "We continue anyway.",
                bad_hex, good_hex, mb_hex, bad_hex);
        free(good_hex);
  }
@@@ -956,7 -956,7 +956,7 @@@ int bisect_next_all(const char *prefix
  {
        struct rev_info revs;
        struct commit_list *tried;
-       int reaches = 0, all = 0, nr;
+       int reaches = 0, all = 0, nr, steps;
        const unsigned char *bisect_rev;
        char bisect_rev_hex[41];
  
@@@ -998,8 -998,10 +998,10 @@@
        }
  
        nr = all - reaches - 1;
-       printf("Bisecting: %d revisions left to test after this "
-              "(roughly %d steps)\n", nr, estimate_bisect_steps(all));
+       steps = estimate_bisect_steps(all);
+       printf("Bisecting: %d revision%s left to test after this "
+              "(roughly %d step%s)\n", nr, (nr == 1 ? "" : "s"),
+              steps, (steps == 1 ? "" : "s"));
  
        return bisect_checkout(bisect_rev_hex);
  }