| commit | 3ae7c7d7a089d8c837264c49dab74fae0436dc10 | [log] [tgz] |
|---|---|---|
| author | Axel Richard <axel.richard@obeo.fr> | Mon Jun 22 09:53:37 2015 +0200 |
| committer | Axel Richard <axel.richard@obeo.fr> | Tue Jul 07 14:50:33 2015 +0200 |
| tree | d7f3f65bac352bed5314ef8bcf8d1505f058f0a6 | |
| parent | 9afd308f73ce27c0e7f09edfe6533adeed8df500 [diff] |
[470503] Some cascading diffs not merged with menu/merge actions Cascading diff was not taking into account with the contextual menu. It was also not taking into account by the merge right to left / left to right actions. Add new test case. Change-Id: I1cd7bf15359c875ded35585e56d253d7db2f4617 Signed-off-by: Axel Richard <axel.richard@obeo.fr>