The tests above are required then optional then none. Follow the same pattern here. Just moving things around (see git's --color-moved option). Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>