cherry-pick: add tests for new --ff option
commitb5c1a28b4c7d7e1324fa3e88ae03801d4fe9f6bb
authorChristian Couder <chriscool@tuxfamily.org>
Sat, 6 Mar 2010 20:34:43 +0000 (6 21:34 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 07:58:47 +0000 (6 23:58 -0800)
tree90a882de2802d6afe3260230f6a611a1b9585545
parentc62f6ec341b1a768be7c9adf84d07c5b3b113a81
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>
t/t3506-cherry-pick-ff.sh [new file with mode: 0755]