Binary diff/merge proposal

Gordon Tyler gordon at doxxx.net
Wed Oct 13 13:20:18 BST 2010


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

On 10/12/2010 6:02 PM, jbowtie at amathaine.com wrote:
> Merge tools are selected in the same way as differs. For merge tools
> we need to flag whether it supplies a gui for conflict resolution or
> not.

Why does it matter whether a merge tool supplies a GUI?

Ciao,
Gordon

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJMtaQCAAoJEIrPJfWinA2uy94IAJy+iXaoepDQuJW1C+aweAnO
QcJs/6+u7hdYhe8SZUkaG99wdpXE6ftjtQGDseBd1xh+Nnv+aIIFMJArHExMwbnU
uVWd9MesEABdp2lR3E0jM4h6oxdRgch465CK21esoFXbLvGOMo5zbsvA8FXilSf5
4DLkNIg14EZHmx+rAKtlANfUy6r7nwxzOuycUWMZYpjqzIQbEieUELuoPWScEolH
N/+tK91uQnhIlrBU86SZtpDKe8VY4/uyhe1LMo2lufJmeVhgsRVP4UMEjgyS6yOL
ah7zzBKEXYRp5abMIebvEWL4Fk5bYqb++eNwFE3ZznX2nueXs0thQCM8N6S6j9Q=
=Cs1F
-----END PGP SIGNATURE-----



More information about the bazaar mailing list