tag | 68bbd214235e103ec6c5fc019144e10626f10af7 | |
---|---|---|
tagger | lgoubet <laurent.goubet@obeo.fr> | Tue Jun 04 13:52:26 2019 +0200 |
object | 23df29bcb7866598f4e249e3da98a52142f62d9b |
3.3.7.201905300200
commit | 23df29bcb7866598f4e249e3da98a52142f62d9b | [log] [tgz] |
---|---|---|
author | lgoubet <laurent.goubet@obeo.fr> | Wed May 29 09:58:32 2019 +0200 |
committer | lgoubet <laurent.goubet@obeo.fr> | Wed May 29 09:58:32 2019 +0200 |
tree | 285a3cb1b505eef9d58e98354140e41e8e53a150 | |
parent | 7f0ed79430efeb4e0755a5ebdf0f91b013d2b170 [diff] |
Enable users to merge all conflicts at once through right-click action Change-Id: I77b5f6715aa87d2dae9d1adf73a20e502b90e1a8