Index.xs: Added has_conflicts() method
Index.pm: Added documentation for has_conflicts()
IndexEntry.pm: Added stub
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)