Include the merge level, favor, and style flags into the xmparam_t struct.
This removes the bit twiddling with these three values into the one flags
parameter.
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>