aaron.bentley at utoronto.ca
Fri May 27 05:22:57 BST 2005
-----BEGIN PGP SIGNED MESSAGE-----
Martin Pool wrote:
> I've just put in code to allow file diffs to be shown using an external
> GNU diff.
I've also got code to invoke GNU diff in patches.py. We should probably
look at unifying them. Actually, if we don't wind up using changeset.py
for generating bzr changesets, we can cut out all references to external
diff/patch from the merge code.
Dunno what to do about diff3, though, and if we still depend on that, it
hardly matters whether we depend on diff/patch.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar