[diff/merge] IDEA-88948, IDEA-87029 Put the other side of applied conflicted change...
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Fri, 10 Aug 2012 15:29:56 +0000 (19:29 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Fri, 10 Aug 2012 15:29:56 +0000 (19:29 +0400)
commitc8770ead5e79eb7b529dd819a9f7ef9a2e1ae27c
treefa11e6a5c619551af0b16314130ab7de277e6894
parent381572ba8ff2732ed7c7429b58101d1c580f2781
[diff/merge] IDEA-88948, IDEA-87029 Put the other side of applied conflicted change to the right ChangeList.

It is the right changelist, if the left one is applied; it is the left changelist if the right one is applied.
platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ConflictChange.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeConflict.java