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