When you merge you do not get always a diff of files. This fix correct that for the case of commit 9a2b8e249a.
9a2b8e249a