show-diff: don't print out the full "ce" format for unmerged files
It really doesn't make sense, since there are potentially _many_ different cache entries for an unmerged file. So just do the "U pathname" thing.
Showing
想要评论请 注册 或 登录
It really doesn't make sense, since there are potentially _many_ different cache entries for an unmerged file. So just do the "U pathname" thing.