Merge branch 'tr/merge-unborn-clobber'
* tr/merge-unborn-clobber: Exhibit merge bug that clobbers index&WT Conflicts: t/t7607-merge-overwrite.sh
Junio C Hamano committed
Feb 9, 2011 at 16:41 UTC
1a9fe453263137be7d42e6fbfc041b5b2d9521d7
No changes.