We still said resolve was the default in handful places.
Signed-off-by: NJunio C Hamano <junkio@cox.net>