Handle merge result in fast-forward merge

Signed-off-by: Stefan Widgren <stefan.widgren@gmail.com>
Add argument to handle checkout options in normal merge

Signed-off-by: Stefan Widgren <stefan.widgren@gmail.com>
Update merge function to handle merge result and checkout options

Signed-off-by: Stefan Widgren <stefan.widgren@gmail.com>