[plt-dev] svn merginfo property

Anyone understand svn merging enough to be able to decode this error
message? I was doing a merge from some (old....) code that I wanted to
get back to (figuring that a merge was the way to get started).

Conflict for property 'svn:mergeinfo' discovered on 'stxclass/main.ss'.
They want to delete the property, you want to change the value to
'/trunk/collects/stxclass/main.ss:4-13254,13911-13980'.
Select: (p) postpone, (mf) mine-full, (tf) theirs-full,
        (h) help for more options:


Robby