Fix broken build

* src/git2r_merge.c (git2r_normal_merge): Add argument ‘merge_opts’ to
  fix undeclared error.

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