Ensure merge commits, which will have just a comment but no files, do not fail