Custom merge tools

[Philippe Lhoste]

马旋（SuperMMX） wrote:
> So the whole flow look like this:
> 
> bzr merge other-branch
> bzr extmerge

This confused me a lot. Perhaps I should have read some manual 
somewhere. I had extmerge keeping to told me there was nothing to merge 
while pull was telling otherwise! :-)

I naively thought bzr extmerge was a replacement for bzr merge like bzr 
diff --using is bzr diff with an external tool.
I wonder why extmerge doesn't do a merge first then call the external tool.

-- 
Philippe Lhoste
--  (near) Paris -- France
--  http://Phi.Lho.free.fr
--  --  --  --  --  --  --  --  --  --  --  --  --  --