<br>That's what I've done and at the risk of repeating things which have already been said in other ways, here is the simple advice I give my coworkers. Maybe it helps someone who stumbles onto this thread.<br><br>
<u>How to set up Beyond Compare as your external merge tool in Bazaar Explorer</u><br>1. Install bzr-extmerge<br>2. Launch bzr-explorer; navigate to Settings > Configuration > User Configuration<br>3. Activate the Merge tab.<br>
4. Add entry: c:\Program Files\Beyond Compare3\Bcomp.exe /ro %b %o %t %r<br> Note: the second and third file macros are mapped to the right and middle Beyond Compare panes, respectively!<br>5. NEVER click on the Resolve Conflicts icon in the bzr-explorer "What's next?" pane.<br>
6. ALWAYS right-click on the conflicted file in the Working Tree and use "Merge conflict" and "Mark conflict resolved"<br><br>This seems to work pretty well for us, except when someone thinks he's too smart to follow instructions. :)<br>
<br>Note: It would be nice if extmerge simply did argument substitution, but it seems to reject tool-specific options which run into the file placeholders. For example, BC3 understands thin /vcsleft=<file> but ext-merge rejects /vcsleft=%b. Not a big deal but potentially aggravating for someone trying to use the command-line recommended by their merge tool.<br>
<br>Thanks,<br>~M<br><br><br><div class="gmail_quote">On Thu, Jun 17, 2010 at 2:23 AM, Gary van der Merwe <span dir="ltr"><<a href="mailto:garyvdm@gmail.com">garyvdm@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<div class="im">On Thu, Jun 17, 2010 at 2:13 AM, Maritza Mendez <<a href="mailto:martitzam@gmail.com">martitzam@gmail.com</a>> wrote:<br>
> Meanwhile, if I wanted to "just get my job done" as a developer of<br>
> general-purpose software (not bzr) using a third-party GUI 3-way merge tool<br>
> *and* I wanted to stay inside the bzr-explorer environment, what do folks<br>
> here recommend?<br>
<br>
</div>Install bzr-extmerge configure it to use your merge tool.<br>
<br>
E.g.: I have this in my bazaar.conf:<br>
external_merge = meld %t %r %o<br>
</blockquote></div><br>