[#6229] remove unnecessary test git files
[#6229] add merge commit to test data
[#6629] fix and test for merge commit's lack of rename output