| 1 |
-----BEGIN PGP SIGNED MESSAGE----- |
| 2 |
Hash: SHA1 |
| 3 |
|
| 4 |
On 09/10/2013 02:29 AM, Gilles Dartiguelongue wrote: |
| 5 |
> As a follow up to this discussion, I came with the attached patch. |
| 6 |
> It appears to work ok for regular merges and binpkg merges with |
| 7 |
> FEATURES="collision-protect". |
| 8 |
> |
| 9 |
> Per my reading of PMS it does not appear to violate anything so I |
| 10 |
> guess it is ok. |
| 11 |
> |
| 12 |
|
| 13 |
unreadable diff |
| 14 |
-----BEGIN PGP SIGNATURE----- |
| 15 |
Version: GnuPG v2.0.20 (GNU/Linux) |
| 16 |
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ |
| 17 |
|
| 18 |
iQEcBAEBAgAGBQJSLldDAAoJEFpvPKfnPDWzAlEIAKieKaMfao/xpimPOWShEZZW |
| 19 |
AedAHki/r5b4IsZBYeE3m971SBWXMYvL4W7KAGPiLHeUzKXzN6wYLLx5Bru/uWnP |
| 20 |
Gh7WYYnCq93Z9VnPXeeUd6Cau7cNSdcMEfjE4BRA06aNu2KSdXV3rC5PTTVM5KX0 |
| 21 |
VJ9BgjzvCs9YDzv2pmsBthoVAZv4zqrpDXLJJD6yzCyFQN/rHntnzij3aYUEAGVu |
| 22 |
99axU7nWUrbBFOQ4C+J0ANSS1gkd+rmFudWnQ9pBpzPpPD4aQUwLTFc6+bf3Beho |
| 23 |
jeD8TVAkUqr5OcuF278E0Rg0nqN/rvi8wglbO6855NTYi1SdNRJncujzOmc2gNI= |
| 24 |
=DDxq |
| 25 |
-----END PGP SIGNATURE----- |
Archives