bump libgit2 to 504a4f
Start adding merge functionality.
Fix an issue with passing no options to `Tree#merge`.
Add tests for `Tree#merge`.
Add and enable merge options.
Document merge options.