difftools trouble with CR LF on Windows

[Matt McClure]

I'm having trouble with difftools/bzr adding an extra CR to each line of
revisions in a diff.

I'm using the difftools plug-in on Windows with WinMerge.  Most of my files in
bzr have CRLF line endings.  When WinMerge displays the files after a command
like:

bzr diff --using WinMerge.exe Shizzle.cpp

the "before" side of the diff has lines that end in CRCRLF.  The extra CR on
one side of the diff obviously makes seeing the real differences very difficult.

Any known fix/workaround?

Thanks,
Matt