Deal with renames sanely when diffing master and HEAD.