commit | 6b7ff72076920b9913bcbb6dceded85830ef25a4 | [log] [tgz] |
---|---|---|
author | lgoubet <laurent.goubet@obeo.fr> | Thu Aug 29 17:26:11 2019 +0200 |
committer | lgoubet <laurent.goubet@obeo.fr> | Fri Aug 30 14:33:13 2019 +0200 |
tree | e3aace6f8a29480c301df8e7e961089b8b58669c | |
parent | b66be13a918e0a83aae89b6f38fa087672e524ee [diff] |
The "accept/reject" all non-conflicting action shouldn't touch conflilts Change-Id: I7977fcf32e86c86f75369563d438bf3f7abdc628