IDEA marks lines that are inserted above or below a line that has been modified as belonging to the same block of changes (that is, in red). This makes rolling back the modified lines troublesome as the inserted lines will be removed. Please treat inserted lines seperately from modified lines. I suspect the same can be applied to deleted lines.