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

[Szilveszter Farkas]

Hi,

this bundle introduces an initial implementation of the Conflicts
dialog, and also adds a gconflicts command.

Cheers,
Szilveszter / phanatic
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-gtk_conflicts.patch
Type: text/x-patch
Size: 9622 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070203/0c655173/attachment-0001.bin