Fix duplicate key exception

When in `Solve merge conflicts` dialog I double-click a file to open it in P4Merge an exception is thrown. Some key (I think it was `diff`) is being added to the dictionary twice.