merge script: tweak unmerged files message to match builtin