| commit | 3e21ddf7ea728878c029edcf953f6676b536655e | [log] [tgz] |
|---|---|---|
| author | Philip Langer <planger@eclipsesource.com> | Wed Jun 17 17:41:14 2015 +0200 |
| committer | Axel RICHARD <axel.richard@obeo.fr> | Thu Jun 18 11:09:11 2015 -0400 |
| tree | 770f697a48a7a215f7460db43eaf0b77d6fae362 | |
| parent | 174442ffbe40a61466a82626a9db1b11f60e7d01 [diff] |
[462884] Adds and integrates MergeContainedNonConflictingAction into UI Also incorporates filters that may potentially be applied to tree nodes. Filtered tree nodes that represent differences will not be included in the merge action. Bug: 462884 Change-Id: Ie873dab03eb8d53a70ff70146680f292ef864e52 Signed-off-by: Philip Langer <planger@eclipsesource.com>