-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Adrian Wilkins wrote: > > I see the previous merge RQ has been marked "superceded" ; I'm not sure what > criteria are applied to decide that status, but nothing that adds the patch > feature has been committed, so for the time being I shall assume it timed out. > > Herein is a small refinement that copes with the case where there is no "BASE" > file, as occurs after a weave merge, as well as the previous improvements to > the > conflict merging caller.
Disregard comment about superceding ; that was the old one that languished in the non-subscribers bin for a while. Apologies. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIY2fucP1uebIhWSYRAlmXAJ4vEkWFxK62KFyVYcKSZI/pD/hAbACfeE5/ 7e+dNIJZhc0H0xxXjcY+5kU= =EFZ0 -----END PGP SIGNATURE----- -- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
