How to diff changed form file - ( .Designer InitializeComponent )

Question

Using Suversion and WinDiff its no problem to branch / merge class-projects and web-projects.

The only kind of project I can never merge are winform projects. The InitializeComponent method is always scrambled after only little changes.

Is there any good way to enable diff / merge for .Designer - files?

EDIT:

I used a 3 way diff like Bert suggested. It made things a lot more easy. But still Winform - files (.designer and .resx ) were not mergeable.

Answer 1

We have a different method of ensuring that diffs are a bit more managable. We have a trigger on checkin that will modify the designer files InitializeComponent section into a consistent and ordered manner, so that diffs show the real changes.

we want to split InitializeComponent into 4 sections - creation, layout suspension, setup and layout resuming. Each of these sections are then separately ordered according to the names of the controls.