| commit | dde3be5a4c93fa558843a9ed81817057564e8e8d | [log] [tgz] |
|---|---|---|
| author | Philip Langer <planger@eclipsesource.com> | Thu Oct 27 17:29:25 2016 +0200 |
| committer | Philip Langer <planger@eclipsesource.com> | Thu Oct 27 17:29:25 2016 +0200 |
| tree | 2bd58a55afade83f80e0e310ee31d0c3ac8beabb | |
| parent | 59083911a287c51469a45fe91a6b686ee90536db [diff] |
Bug 506631 - Enable pre-merge for model-based merging with conflicts Change-Id: If8c690e1794049f15f9c548d7af1ebc458f589e9 Signed-off-by: Philip Langer <planger@eclipsesource.com>