diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-08-14 13:26:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-14 13:26:40 -0700 |
| commit | f12cb5052d83f5477f7311ccf00b4249dc6d500b (patch) | |
| tree | 9eb67f6f590c6e810afa35612d575bda75e469a0 | |
| parent | fac96dfbb1c24369ba7d37a5affd8adfe6c650fd (diff) | |
| parent | ff29a61cbbc83f0948606df37dbc734436b62c17 (diff) | |
| download | git-f12cb5052d83f5477f7311ccf00b4249dc6d500b.tar.gz | |
Merge branch 'ob/rebase-conflict-advice-i18n-fix'
i18n coverage improvement and avoidance of sentence lego.
* ob/rebase-conflict-advice-i18n-fix:
advice: handle "rebase" in error_resolve_conflict()
| -rw-r--r-- | advice.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -191,9 +191,10 @@ int error_resolve_conflict(const char *me) error(_("Pulling is not possible because you have unmerged files.")); else if (!strcmp(me, "revert")) error(_("Reverting is not possible because you have unmerged files.")); + else if (!strcmp(me, "rebase")) + error(_("Rebasing is not possible because you have unmerged files.")); else - error(_("It is not possible to %s because you have unmerged files."), - me); + BUG("Unhandled conflict reason '%s'", me); if (advice_enabled(ADVICE_RESOLVE_CONFLICT)) /* |