| commit | 42be4e873ad5afc43bcf124d49a30a4bbb9152d0 | [log] [tgz] |
|---|---|---|
| author | lgoubet <laurent.goubet@obeo.fr> | Tue Jul 16 16:48:52 2019 +0200 |
| committer | lgoubet <laurent.goubet@obeo.fr> | Tue Jul 16 16:58:33 2019 +0200 |
| tree | 502cc6b3a1fa7290b4373ca322b5b8618e45e6a0 | |
| parent | 42f0b44af4e8d8b4a953234913d514a03c4225bb [diff] |
Properly describe what the conflict resolving actions will do. Change-Id: I31b1c4d777c8a84d3c782e4e4eae700116babccf