mono/monodevelop — pull request #381 by Therzok (2013-08-21 10:29:57+00:00)
Title: [Version Control] Resolve Conflicts command for broken projects/solutions.

In case we have a conflicted project/solution file, we now offer a right click menu option to fix this.