What is the status of the qbzr diff/merge config bug (489915)?

[Patrick van der Velde]

Hi Guys

I just spend 45 minutes trying to get a merge tool to work in
tortoiseBzr and BzrExplorer. and I just can't for the life of me work
out how to make it work. I've set the (expected / guessed) commandline
in the global bzr options (through the settings dialog) but those are
just happily ignored. I'm expecting that bug 489915 is the cause of
this all (but I may be wrong) so could somebody:
1) tell me what the status is?
2) tell me how to use a merge tool with bzr (command line merging is
NOT an option) so that I can get this merge conflict changed

And on a side note can somebody tell me how to get BzrExplorer to show
me diffs of changed files? I just can't seem to find a good way to
quickly see changed files and get their diffs (something like the
TortoiseSVN - check for changes window)

Thanks

Patrick