git-merge-ours: make sure our index matches HEAD
git-merge expects this check to be done appropriately by the
merge strategy backends. In the case of merge-ours strategy,
the resulting tree comes what we have in the index file, so it
must match the current HEAD; otherwise it would not be "ours"
merge.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
Showing
想要评论请 注册 或 登录