![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800) | ||
| commit | 1a9fe453263137be7d42e6fbfc041b5b2d9521d7 | |
| tree | 5d55b038cada0490cbf7aa69da76c7b6255de58e | tree | snapshot |
| parent | 75513914784bb75447c71e3b001612ee37af386c | commit | diff |
| parent | 5b3270817712e8eedb468e906cb1042a5a311ad4 | commit | diff |
Merge branch 'tr/merge-unborn-clobber'
* 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 |