-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 05/30/10 11:21, Domen Kožar wrote: > Hey! > > Maybe I am missing something, but why not use difflib and pygments on > top of that? > > Cheers, Domen >
That's a good option. Pros: Can easily integrate the diff viewer into my application. Cons: Doesn't seem to be a way to interactively merge files (not a big deal for me) As for generating the diff is it ok to use difflib to generate the diff text? I hear there is a diff environment variable..(but I can't seem to find it now) should I use that instead? - -- My GnuPGP key at: www.basementcode.com/public_key.txt -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJMAoPtAAoJEDqfZIFeqFH7+NYH/3J6IS4woiS5KI3KIDdPA5eU 9VBaC8xRJEJ/fwYXoxaRqkWft2hAd/FahbPMzZI9RiA3tEu8Cv8NE6nvtXTJoe6U zJ/8gIszJVEG3QnADvzdSr03kCWCsom5iZBuEYP0eK/VT9cgsjiTsc71p0h7zcIK TosCrKMkya3IJ3svBXLnJhgtcekfmP2Qk8gQt4o/UMW1D7abP5kI2zxidgsGEL1V YBu4HOirte9RFzEIZBClFW0LpUZ0Ix2Rpf614GvAEW+5HK34hfQHMxdmPCVVLv7W KNMspLUOaOEVnufhz8i5UvKvbMCjj5PItTvEQlsJ/xzrB2bZqIWK1iYZp07PdmI= =CWy/ -----END PGP SIGNATURE-----
