1 commit

Author	SHA1	Message	Date
Christian Couder	b5c1a28b4c	cherry-pick: add tests for new --ff option ... Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-03-06 23:58:47 -08:00