resolve_gitlink_packed_ref(): fix mismerge