bisect: correction of typo
Signed-off-by: Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Antoine Delaite committed
Jun 23, 2015 at 14:54 UTC
f6216c2c5c113bc6b1ed008c5ed01062042382e1
2 files changed
+2
-2
bisect.c
+1
-1
@@ -743,7 +743,7 @@ static void handle_bad_merge_base(void)
743
744
fprintf(stderr, "Some good revs are not ancestor of the bad rev.\n"
745
"git bisect cannot work properly in this case.\n"
746
- "Maybe you mistake good and bad revs?\n");
746
+ "Maybe you mistook good and bad revs?\n");
747
exit(1);
748
}
749
t/t6030-bisect-porcelain.sh
+1
-1
@@ -362,7 +362,7 @@ test_expect_success 'bisect starting with a detached HEAD' '
362
test_expect_success 'bisect errors out if bad and good are mistaken' '
363
git bisect reset &&
364
test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&
365
- grep "mistake good and bad" rev_list_error &&
365
+ grep "mistook good and bad" rev_list_error &&
366
git bisect reset
367
'
368