[git] Fix show diff with parent for merge revisions, especially for moved files ...