rerere: fix breakage of resolving.