Commit 8d3b2ee3d73d73d5e185ab796d271da3328995c8

Edward Thomson 2014-10-11T20:56:50

Introduce failing test for conflict filtering in index