Repository.xs: git_repository_state() does not return an error code, only the state
Repository.xs: WIP merge()
Index.xs: Added conflict_cleanup method
Reference.xs: Allow target() to take a new target
15-merge.t: Added tests cases for merging (WIP)