builtin-merge: fix a typo in an error message
Signed-off-by: NAllan Caffee <allan.caffee@gmail.com> Acked-by: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
Showing
想要评论请 注册 或 登录
Signed-off-by: NAllan Caffee <allan.caffee@gmail.com> Acked-by: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>