checkout: error out when index is unmerged even with -m
Even when -m is given to allow fallilng back to 3-way merge while switching branches, we should refuse if the original index is unmerged. Signed-off-by: NJunio C Hamano <gitster@pobox.com> Acked-by: NDaniel Barkalow <barkalow@iabervon.org>
Showing
想要评论请 注册 或 登录