diff options
author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 23:02:16 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-01-06 00:29:23 +0300 |
commit | 12909b6b8a4a51e9d2b46610be4f93c782949c80 (patch) | |
tree | e0643769171bc1f80a17d52c7724b8fee3b21978 /t/t3431-rebase-fork-point.sh | |
parent | c488182903d97da70b7a486e514ab871345067cc (diff) |
i18n: turn "options are incompatible" into "cannot be used together"
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3431-rebase-fork-point.sh')
-rwxr-xr-x | t/t3431-rebase-fork-point.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh index 4c98d99e7e..1d0b15380e 100755 --- a/t/t3431-rebase-fork-point.sh +++ b/t/t3431-rebase-fork-point.sh @@ -83,7 +83,7 @@ test_expect_success 'git rebase --fork-point with ambigous refname' ' test_expect_success '--fork-point and --root both given' ' test_must_fail git rebase --fork-point --root 2>err && - test_i18ngrep "cannot combine" err + test_i18ngrep "cannot be used together" err ' test_expect_success 'rebase.forkPoint set to false' ' |