Eric Wong 9a99c087da rebase: allow --merge option to handle patches merged upstream ...

Enhance t3401-rebase-partial to test with --merge as well as
the standard am -3 strategy.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

2006-06-25 00:38:34 -07:00

1.6 KiB

Executable File

Raw Blame History

View Raw