| commit | ccfc03dd6521ffd2cbd803a18b12c204fd5e54d0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 4 Feb 2011 00:02:21 +0000 (3 16:02 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 4 Feb 2011 00:02:21 +0000 (3 16:02 -0800) | ||
| tree | 5aafb7cb1662641ed32b5973f3efccfe49f38b5f | treesnapshot (tar.gz zip) |
| parent | 98e1c63f670e9b6d0b1410a336a866617d9ac083 | commitdiff |
| parent | 5b3270817712e8eedb468e906cb1042a5a311ad4 | commitdiff |
Merge branch 'tr/merge-unborn-clobber' into next
* 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 | blobhistory |