WinMerge is a compare tool that lets you make changes to the compared files because it acknowledges that many times you are wanting to "merge" - not just look.
However, there does not appear to be a way in WinSCP to set this up. If I set it up as an editor, I can't load two files. If I set it up as a custom command - I can't save back.