I've done this for arrays in JSON files, so that git merge will merge two changes that append to the list without a conflict. I think the right answer is to fi

I've done this for arrays in JSON files, so that git merge will merge two changes that append to the list without a conflict. I think the right answer is to fix the merge algorithm to handle some common cases where an inserted line logically includes the delimiter at the end of the previous line.