From: Junio C Hamano <hidden> Date: 2016-06-15 22:42:13
Linus Torvalds [off-list ref] writes:
If we left things in the index in an unmerged state, we'd be guaranteed to
either _fail_ that git commit unless somebody has done the
git-update-index (or names the files specifically on the commit command
line, which will do it for you).
So I think I agree.