Custom merge tools

[马旋（SuperMMX）]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi, Philippe Lhoste <PhiLho at GMX.net> :

On Thu, 02 Apr 2009 23:26:45 +0200
Philippe Lhoste <PhiLho at GMX.net> wrote:

> 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.

Because it is not the intention to replace "merge" command, it is just
to resolve conflicts that are generated by "merge" command, 
with custom tools instead of manual work.

And also, you have to mark them as resolved via command "bzr resolve".

- -- 
A. Because it makes the logic of the discussion difficult to follow.
Q. Why shoudn't I top post?
A. No.
Q Should I top post?

A: Because it destroys the flow of the conversation
Q: Why is it bad?
A: No, it's bad.
Q: Should I top post in replies to mailing lists? 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (MingW32)

iEYEARECAAYFAknVhdkACgkQYjhzyV/TMxtvzACeLvjMQAy9xsaj6f4ZXM+2CghP
aQIAn3MVBM8NZO06UqR0K8LPS2v5eMcY
=EoXy
-----END PGP SIGNATURE-----