Bert Wesarg 560119b9ab refactor merge flags into xmparam_t ... 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: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2010-03-02 11:51:48 -08:00
..
xdiff.h
xdiffi.c
xdiffi.h
xemit.c
xemit.h
xinclude.h
xmacros.h
xmerge.c
xpatience.c
xprepare.c
xprepare.h
xtypes.h
xutils.c
xutils.h