Bazaar

  1. Bug #41435
  2. Comment #4

Comment 4 for bug 41435

Revision history for this message
Aaron Bentley (abentley) wrote : Re: [Bug 41435] Re: Framework for external diff/merge tools

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

Martin Pool wrote:
> I agree, there should be a built in capability to use external merge
> tools. difftools at least looks fairly reasonable to merge in.

I don't think it's a very good idea to use visual merge tools in-process
as part of the merge. I like the approach extmerge takes better.

But it isn't hard to write a Merger subclass that uses an external tool.
 See merge.Diff3Merger for an example.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFqx340F+nu1YWqI0RApuLAJ49fu02hWZ7WYPCOCkI6RW2rRDd0ACdHnXK
OoV7FKBgvLGd9vrKfSrVta0=
=bw3u
-----END PGP SIGNATURE-----