gitextensions/gitextensions — pull request #1767 by mdonatas (2013-03-29 12:07:12+00:00)
Title: 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.