Andrew's git / gitweb.git / diff
?
Merge branch 'tr/merge-unborn-clobber'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800)
* tr/merge-unborn-clobber:
Exhibit merge bug that clobbers index&WT

Conflicts:
t/t7607-merge-overwrite.sh

No differences found