I've not been very active updating this blog. First, I'm in the process of setting up another blog that would support some stuff I have pending, and on my own domain name. Plus it would be nice to re-upload my old archives of entries and without controlling the code it's gonna be hard.

Second issue for me, and the major one, is that my time is extremely limited as we're all working very hard on the project we're working on at the moment (WPF of course). And it comes down to a choice to make between my blog and my contributions in the msdn forum.

So for now, you can find me on the msdn wpf forum. I genuinely think my time is better spent there for the next few weeks, until the new blog arrives!

Found in msdn, to change the diff/merge tool used on conflicts with TFS:

Go to Tools > Options > Source Control > Visual Studio Team Foundation Server > Configure User Tools...

Add a Compare pointing to winmergeU.exe and using:

/e /x /s /wl /dl %6 /dr %7 %1 %2

as a command-line argument.

Repeat the operation for merge, this time using:

/e /s /x /ub /dl %6 /dr %7 %1 %2 %4

Enjoy!

Or the night rather...

[Conditional("GRIDPARANOIA")]

Yeah, I'd be suffering from a paranoid condition if I had responsability to code the System.Windows.Controls.Grid :)