James Westby wrote:
> I think what I would like to do is use strict=True and then let
> merge3 do the merge if we can't parse it. That way we won't drop
> text if we can't parse it.
>
> Thanks,
>
> James
>
That is what I ended up with. I don't know if the current diff shows that.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
James Westby wrote:
> I think what I would like to do is use strict=True and then let
> merge3 do the merge if we can't parse it. That way we won't drop
> text if we can't parse it.
>
> Thanks,
>
> James
>
That is what I ended up with. I don't know if the current diff shows that.
John
=:->
-----BEGIN PGP SIGNATURE----- enigmail. mozdev. org/
1na4ACgkQJdeBCY SNAAMTQgCfYfcKC ebNDyQPtpkwkCrI nf0S m7J24Gr7U1p/ sBsfQsQS
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkt
Bh0Anit1wIn+
=h8Ig
-----END PGP SIGNATURE-----