Resolving conflicts with Bazaar Explorer

[DeeJay]

"It would be nice if bzr explorer used bzr extmerge."

If I understand correctly, from v 0.16 of qbzr, it does.

The release notes say -
"* qcommit/qbrowse:
   * Conflicts are shown in the status column. External merge applications
     can be launched to resolve these conflicts, and the conflicts can be
     marked as merged."

On Windows, at least, it works just as described.

There is a blog entry about it here -
http://bazaarvcs.wordpress.com/2009/11/08/new-working-tree-features-in-qbzr/

DeeJay