![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 31 Jan 2011 03:03:19 +0000 (19:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 31 Jan 2011 03:03:19 +0000 (19:03 -0800) | ||
| commit | 4642416efda4b0ac642f68c06577872ea66682e6 | |
| tree | d54b4e9e08eddb07519d6cc5d6306fe29e02f3fa | tree | snapshot |
| parent | bdefc8eb97f52c44b27be84b69361b80c8b3e999 | commit | diff |
| parent | 5b3270817712e8eedb468e906cb1042a5a311ad4 | commit | diff |
Merge branch 'tr/merge-unborn-clobber' into pu
* tr/merge-unborn-clobber:
Exhibit merge bug that clobbers index&WT
Conflicts:
t/t7607-merge-overwrite.sh
* tr/merge-unborn-clobber:
Exhibit merge bug that clobbers index&WT
Conflicts:
t/t7607-merge-overwrite.sh
| t/t7607-merge-overwrite.sh | diff1 | | diff2 | | blob | history |