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 /t/unit-tests/t-basic.c | |
| parent | fac96dfbb1c24369ba7d37a5affd8adfe6c650fd (diff) | |
| parent | ff29a61cbbc83f0948606df37dbc734436b62c17 (diff) | |
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()
Diffstat (limited to 't/unit-tests/t-basic.c')
0 files changed, 0 insertions, 0 deletions