test multi-step verbs
test multi-step verbs

Add tests for rebase merge, rebase apply, merge, cherry pick, revert,
and bisect.  Helper function to create a conflict so three way merge
fails leaving the user with a step to figure it out.

dbrinegar/gitutils