git-merge-ours: make sure our index matches HEAD
authorJunio C Hamano <junkio@cox.net>
Thu, 3 Nov 2005 09:51:25 +0000 (01:51 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 3 Nov 2005 22:55:11 +0000 (14:55 -0800)
commit160252f...1626d865b9e902abffe5e4976944c930
tree667f245...733fbb2f12fdaef832639c51132a01fccopy hash to clipboard (tree)
parent64da9e6...4eea25c9c20cfe12618285ccd0bf3cfecopy hash to clipboard (diff)
git-merge-ours.sh