| commit | 30fd3a54256a54e5a6006a203c923e97641fb2c2 | |
| author | Clemens Buchacher <drizzd@aon.at> | |
| Sat, 14 Apr 2012 23:15:17 +0000 (15 01:15 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Apr 2012 05:44:39 +0000 (15 22:44 -0700) | ||
| tree | b294e986c72d687d1d326bc2658e6e938f251434 | treesnapshot (tar.gz zip) |
| parent | 36e6c803a1ef68b8acdc4138597db4fb087112be | commitdiff |
merge overwrites unstaged changes in renamed file
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7607-merge-overwrite.sh | diffblobblamehistory |