[#6629] fix and test for merge commit's lack of rename output
2 files changed