Add argument commit_on_success to merge branch

* R/merge.r: If there are no conflicts written to the index, the merge
  commit will be committed. Default is TRUE.

* man/merge-methods.Rd: Update documentation

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