added additional options to merge task with tests
add documentation for new merge options
Merge branch 'git_merge_options'