Update callMethods

* src/git2r.c: Add 'git2r_merge_branch' to callMethods

Signed-off-by: Stefan Widgren <stefan.widgren@gmail.com>
Add fast-forward merge test case

* tests/fast_forward_merge.R: Add test case

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