If you look in the image below..
The top left is my changes:
$static_pages = 'terms|privacy|about|home|media';
The top right is some one elses changes.
$static_pages = 'terms|privacy|about|home|history';
And the bottom is the result after merge.
It wants me to pick one and discard the other. The way it should actually be merged is:
$static_pages = 'terms|privacy|about|home|history|media';
However, there is no way (that I can tell) for me to select that.
I tried to select one of the two, then make the appropriate changes in the bottom window, but it would not let me make any edits.
I had to select one, save it, then reopen the file and add the rest and save again. This doesn't seem right. Am I doing something wrong or is that just the way it is?