git: resolve renames when diffing