Add diff test for modified file with common history