Repository.xs: Added merge() (WIP)
Index.xs: Added conflict_cleanup method
Reference.xs: Allow target() to take a new target
15-merge.t: Added tests cases for merging (WIP)