Index.xs: Added merge()
Index/Entry.xs: Added clone() + Index.xs: Added add_conflict()
Raw.xs: Make git_index_entry_dup() generic
Index/Entry.xs: Always make a copy
Index.xs: Added get_conflict()
Changes: update
Merge branch 'jacquesg/merge-index-file'