| commit | 1da5b3a19c2bdd646e7ab710308ab41437c56ba3 | [log] [tgz] |
|---|---|---|
| author | lgoubet <laurent.goubet@obeo.fr> | Fri Sep 06 14:38:58 2019 +0200 |
| committer | lgoubet <laurent.goubet@obeo.fr> | Fri Sep 06 17:16:03 2019 +0200 |
| tree | 8afb53ab8a0d1e9601c913dd9bc61ab6b41faf06 | |
| parent | e19f31d1091ef35e3e8f5bdc3ce7da239e64cd6e [diff] |
Diffs depending on pseudo-conflicts do not reject the other side When a diff directly or indirectly requires or implies the merging of a diff that is part of a pseudo conflict, it should not require the rejection of the other side's diffs since a pseudo conflict is something that exists in both sides of the comparison. Change-Id: I97c25caf71b128a7bf302ff48c26859cea10a44b