Commit db39807c8957d88593632f75f8e5e8661a646ee5

Edward Thomson 2018-01-21T11:22:12

CHANGELOG: include merge_file conflict marker size