Skip to main content

Browse the archive

Revision 160252f81626d865b9e902abffe5e4976944c930 authored by Junio C Hamano on 03 November 2005, 09:51:25 UTC, committed by Junio C Hamano on 03 November 2005, 22:55:11 UTC 
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: Junio C Hamano <junkio@cox.net>
1 parent 64da9e6
Raw File
compat 
4
back to top