Resolving conflicts with Bazaar Explorer
smartgpx at gmail.com
Wed Nov 25 17:21:46 GMT 2009
"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 -
* 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 -
More information about the bazaar