-
由 Junio C Hamano 提交于
Otherwise, "git commit" wouldn't have a way to tell that we were in the middle of merging an annotated or signed tag, not a plain commit, after "git merge" stops to ask the user to resolve conflicts. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
274a5c06