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 /commit.c | |
| parent | Git 2.42-rc1 (diff) | |
| parent | advice: handle "rebase" in error_resolve_conflict() (diff) | |
| download | git-f12cb5052d83f5477f7311ccf00b4249dc6d500b.tar.gz git-f12cb5052d83f5477f7311ccf00b4249dc6d500b.zip | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions