[merge][bzr-gtk] Implemented Conflicts dialog and gconflicts command

[Aaron Bentley]

Aaron Bentley has voted -1.
Status is now: Vetoed
Comment:
Not intended for bzr.dev

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3Cbb631e240702030923g33b55a0eq79af038bd96236c7%40mail.gmail.com%3E