rerere: add note about files with existing conflict markers