commit | 9dd78010cbf9bacd29434fb79442f05894b22ca0 | [log] [tgz] |
---|---|---|
author | Laurent Goubet <laurent.goubet@obeo.fr> | Wed Mar 14 17:39:10 2018 +0100 |
committer | lgoubet <laurent.goubet@obeo.fr> | Fri Mar 16 09:26:49 2018 +0100 |
tree | 352fdf82e77aaf99c3e2217a0645cce88f4d44f6 | |
parent | b362286a730fbe7ee9ea9113b62c2ad13629a983 [diff] |
Add actions to merge everything to "get right" or "keep left" Bug: 532438 Change-Id: Ia582ceb05ce4fc7a1c43fa3fb22da123bad28cfc