We still advertise "git resolve" as a standalone command, but never
"git octopus", so nobody should be using it and it is safe to
retire it.  The functionality is still available as a strategy
backend.
Signed-off-by: NJunio C Hamano <junkio@cox.net>