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)
commit1a9fe45...263137be7d42e6fbfc041b5b2d9521d7
tree5d55b03...cada0490cbf7aa69da76c7b6255de58ecopy hash to clipboard (tree)
parent7551391...784bb75447c71e3b001612ee37af386ccopy hash to clipboard (diff)
parent5b32708...7712e8eedb468e906cb1042a5a311ad4copy hash to clipboard (diff)
t/t7607-merge-overwrite.sh