Commit aa3af01db0ab89d6ae56e9656dc28590142fbcc3

Edward Thomson 2015-05-13T15:52:21

index iterator: optionally include conflicts