Index/Entry.xs: Added
Index.xs: Added conflicts() methods
15-merge.t: Added tests for conflicts
Index/Entry.pm: Added documentation for index entries
Changes: update
assorted clean-ups