External merge tool support (WIP)

[Brian de Alwis]

On 5-Aug-2010, at 7:23 PM, Gordon Tyler wrote:
> On 8/5/2010 7:18 PM, Brian de Alwis wrote:
>> On 5-Aug-2010, at 12:33 PM, John Arbash Meinel wrote:
>>> Note that we *do* have 'bzr remerge' which reverts the contents and lets
>>> you re-run the merge (or the merge of a specific file) using a different
>>> merge algorithm. That might be a reasonable place to hang this off as well.
>> 
>> I also thought remerge was the more logical candidate.
> 
> In addition to merge?

Instead of.  I think I'd want to first use merge, and then use "remerge --using tool" for each of the conflicts.

Brian.