diff3 didn't make any sense to me, so just use default.