[QBZR][Merge] Add unidiff format to diff dialog

[John Arbash Meinel]

John Arbash Meinel has voted reject.
Status is now: Vetoed
Comment:
Not intended to be merged into bzr.dev.

You should use "[QBZR/MERGE]" rather than "[QBZR][MERGE]" so that the 
Bazaar bundle buggy doesn't think you are trying to merge it into 
bzr.dev.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C200710152016.55053.kreijack%40tiscalinet.it%3E