merge overwrites unstaged changes in renamed file
authorClemens Buchacher <drizzd@aon.at>
Sat, 14 Apr 2012 23:15:17 +0000 (01:15 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 05:44:39 +0000 (22:44 -0700)
commit30fd3a5...256a54e5a6006a203c923e97641fb2c2
treeb294e98...c72d687d1d326bc2658e6e938f251434copy hash to clipboard (tree)
parent36e6c80...a1ef68b8acdc4138597db4fb087112becopy hash to clipboard (diff)
t/t7607-merge-overwrite.sh